https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12532
--- Comment #64 from Michal Denar <[email protected]> --- I tester bug, but I get error: Applying: Bug 12532 - Send emails to guarantee and guarantor Using index info to reconstruct a base tree... M Koha/Patron.pm M installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: installer/data/mysql/atomicupdate/bug_12532-RedirectGuaranteeEmail_syspref.sql Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 12532 - Send emails to guarantee and guarantor Its on master? Thanks -- 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/
