[Koha-bugs] [Bug 21158] Add cronjob references to the system preference descriptions if a cronjob is required

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21158

Dilan Johnpullé <dilan at calyx.net.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |dilan at calyx.net.au

--- Comment #2 from Dilan Johnpullé <dilan at calyx.net.au> ---
Ran into issue trying to apply:

vagrant at kohadevbox:kohaclone(master)$ git bz apply -s 21158
Bug 21158 - Add cronjob references to the system preference descriptions if a
cronjob is required

77484 - Bug 21158: Add cronjob references to the system preference descriptions
if a cronjob is required

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21158: Add cronjob references to the system preference
descriptions if a cronjob is required
/home/vagrant/kohaclone/.git/rebase-apply/patch:184: trailing whitespace.
            - "<br><strong>NOTE:</strong> This system preference requires the
<code>misc/cronjobs/holds/build_holds_queue.pl</code> cronjob. Ask you system
administrator to schedule it."   
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
<stdin>:184: trailing whitespace.
            - "<br><strong>NOTE:</strong> This system preference requires the
<code>misc/cronjobs/holds/build_holds_queue.pl</code> cronjob. Ask you system
administrator to schedule it."   
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Failed to merge in the changes.
Patch failed at 0001 Bug 21158: Add cronjob references to the system preference
descriptions if a cronjob is required
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-21158-Add-cronjob-references-to-the-system-pre-0j9bCi.patch

-- 
You are receiving this mail because:
You are watching all bug changes.