http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12532
Nick Clemens <n...@quecheelibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Nick Clemens <n...@quecheelibrary.org> --- <h1>Something went wrong !</h1>Applying: Bug 12532 - Redirect guarantee email to guarantor Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Letters.pm Auto-merging C4/Members.pm Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/