http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12204 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |koha@univ-lyon3.fr --- Comment #6 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- 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.