[Koha-bugs] [Bug 12448] Ask for confirmation when checking out an item with rental fees
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sat Jul 26 19:27:56 CEST 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12448
Marc Véron <veron at veron.ch> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #34 from Marc Véron <veron at veron.ch> ---
Sorry, it doesn't apply on current master (3.17.00.010)
Applying: Bug 12448 - Ask for confirmation when checking out an item with
rental fees
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 12448 - Ask for confirmation when checking out an item
with rental fees
--
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
More information about the Koha-bugs
mailing list