https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14570
--- Comment #162 from Liz Rea <wizzy...@gmail.com> --- Apologies, this seems to not apply: Auto-merging members/deletemem.pl CONFLICT (content): Merge conflict in members/deletemem.pl Patch failed at 0001 Bug 14570: Make it possible to add multiple guarantors to a record The copy of the patch that failed is found in: .git/rebase-apply/patch 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". Bug 14570 - Make it possible to add multiple guarantors to a record will have a look to resolve that but you may beat me! Liz -- 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/
