[Koha-bugs] [Bug 11882] Add a new button to the checkout confirmation dialog when checking out a reserved item.
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Mon Nov 17 17:44:48 CET 2014
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11882
Paola Rossi <paola.rossi at cineca.it> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #11 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the two patches against master 3.17.00.055
Applying: Bug 11882 - Add a new button to the checkout confirmation dialog when
checking out a reserved item
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
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Auto-merging circ/circulation.pl
Failed to merge in the changes.
So I pass the patch to "Patch doesn't apply" status.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list