[Koha-bugs] [Bug 14364] Allow automatically canceled expired waiting holds to fill the next hold

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #44 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry, this no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14364 - Allow automatically canceled expired waiting holds to
fill the next hold
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       Koha/Hold.pm
M       installer/data/mysql/mandatory/sysprefs.sql
M       installer/data/mysql/pl-PL/mandatory/sample_notices.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/pl-PL/mandatory/sample_notices.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/pl-PL/mandatory/sample_notices.sql
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Auto-merging Koha/Hold.pm
CONFLICT (content): Merge conflict in Koha/Hold.pm
Auto-merging C4/Reserves.pm
CONFLICT (content): Merge conflict in C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14364 - Allow automatically canceled expired waiting
holds to fill the next hold
The copy of the patch that failed is found in: .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-14364---Allow-automatically-canceled-expired-w-834arw.patch

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