[Koha-bugs] [Bug 23415] Notify patron fines when renewing

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

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

Victoria Faafia <vfaafia29 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |vfaafia29 at gmail.com

--- Comment #22 from Victoria Faafia <vfaafia29 at gmail.com> ---
Applying: Bug 23415: Notify patron fines when renewing
Using index info to reconstruct a base tree...
M       circ/circulation.pl
M       circ/renew.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
M       koha-tmpl/intranet-tmpl/prog/js/checkouts.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/checkouts.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/checkouts.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging circ/renew.pl
Auto-merging circ/circulation.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23415: Notify patron fines when renewing
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-23415-Notify-patron-fines-when-renewing-AHlD9r.patch

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