[Koha-bugs] [Bug 19549] Reserve Slip prints first found hold when patron has multiple holds on a biblio

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

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

Victor Grousset/tuxayo <victor.grousset at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |victor.grousset at biblibre.co
                   |                            |m

--- Comment #5 from Victor Grousset/tuxayo <victor.grousset at biblibre.com> ---
Conflicts:

Bug 19549 - Reserve Slip prints first found hold when patron has multiple holds
on a biblio

68855 - Bug 19549 - Reserve Slip prints first found hold when patron has
multiple holds on a biblio

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 19549 - Reserve Slip prints first found hold when patron has
multiple holds on a biblio
Using index info to reconstruct a base tree...
M       C4/Reserves.pm
M       circ/circulation.pl
M       circ/hold-transfer-slip.pl
M       circ/returns.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
M       t/db_dependent/Reserves.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Reserves.t
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging circ/returns.pl
CONFLICT (content): Merge conflict in circ/returns.pl
Auto-merging circ/hold-transfer-slip.pl
Auto-merging circ/circulation.pl
Auto-merging C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19549 - Reserve Slip prints first found hold when
patron has multiple holds on a biblio
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-19549---Reserve-Slip-prints-first-found-hold-w-T4NFp1.patch

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