[Koha-bugs] [Bug 15561] Add ability to charge cancellation fee from "Holds over" tab

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

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

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

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

--- Comment #29 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patches no longer apply, can you please rebase?

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/circ/waitingreserves.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
Auto-merging circ/waitingreserves.pl
CONFLICT (content): Merge conflict in circ/waitingreserves.pl
Auto-merging C4/Reserves.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15561 - Add ability to charge cancelation fee from
"Holds over" tab
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-15561---Add-ability-to-charge-cancelation-fee--N7o9xj.patch

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