https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Maryse Simard <maryse.simard@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |maryse.simard@inlibro.com --- Comment #9 from Maryse Simard <maryse.simard@inlibro.com> --- Patch doesn't apply Applying: Bug 21034: Re-indent circulation.tt Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt 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 error: Failed to merge in the changes. Patch failed at 0001 Bug 21034: Re-indent circulation.tt -- You are receiving this mail because: You are watching all bug changes.