http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12532
Jesse Maseto <je...@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |je...@bywatersolutions.com --- Comment #7 from Jesse Maseto <je...@bywatersolutions.com> --- Bug 12532 - Redirect guarantee email to guarantor 35313 - Bug 12532 - Redirect guarantee email to guarantor Apply? [(y)es, (n)o, (i)nteractive] y 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/Members.pm Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 12532 - Redirect guarantee email to guarantor When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-12532---Redirect-guarantee-email-to-guarantor-BQ1gJr.patch -- 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/