https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21953 Hayley Mapley <hayleymapley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |hayleymapley@catalyst.net.n | |z --- Comment #10 from Hayley Mapley <hayleymapley@catalyst.net.nz> --- Patch doesn't apply. Applying: Bug 21953: Term 'Lost item' untranslatable Applying: Bug 21953: Add tests Using index info to reconstruct a base tree... M t/db_dependent/Circulation.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Circulation.t CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t error: Failed to merge in the changes. Patch failed at 0001 Bug 21953: Add tests -- You are receiving this mail because: You are watching all bug changes.