http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7673
--- Comment #10 from delaye <[email protected]> --- i have this message when i want apply this patch in a sandbox Applying: Bug 7673 : New patron permissions Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging cataloguing/additem.pl CONFLICT (content): Merge conflict in cataloguing/additem.pl Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt Failed to merge in the changes. Patch failed at 0001 Bug 7673 : New patron permissions When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 7673 - New patron permissions -- 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/
