http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12204
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #6 from Koha Team Lyon 3 <[email protected]> --- tried on a sandbox : <h1>Something went wrong !</h1>Applying: Bug 12204: Display the expiration date on RESERVESLIP Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Reserves.pm Auto-merging C4/Letters.pm CONFLICT (content): Merge conflict in C4/Letters.pm Failed to merge in the changes. Patch failed at 0001 Bug 12204: Display the expiration date on RESERVESLIP -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
