http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11944
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #200 from Paola Rossi <[email protected]> --- Today I try to apply against master 3.17.00.007 The first patch doesn't apply: Applying: Bug 11944: Remove all utf8 filter from templates Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt Auto-merging Koha/Template/Plugin/Branches.pm Failed to merge in the changes. Patch failed at 0001 Bug 11944: Remove all utf8 filter from templates So I pass the patch to "Patch doesn't apply" status. -- 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/
