https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12446
--- Comment #147 from Katrin Fischer <[email protected]> --- Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12446: Ability to allow guarantor relationship for all patron category types Using index info to reconstruct a base tree... M Koha/Patron.pm M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt M members/memberentry.pl M t/db_dependent/Patrons.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Patrons.t CONFLICT (content): Merge conflict in t/db_dependent/Patrons.t Auto-merging members/memberentry.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging Koha/Patron.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 12446: Ability to allow guarantor relationship for all patron category types 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". Patch left in /tmp/Bug-12446-Ability-to-allow-guarantor-relationship--LvEbgJ.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
