http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8034
I'm just a bot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected]. | |org --- Comment #37 from I'm just a bot <[email protected]> --- Applying: bug_8034: Restored network printer maintenance and selection Using index info to reconstruct a base tree... M C4/Auth.pm M C4/Koha.pm M admin/branches.pl M circ/circulation.pl M circ/returns.pl M installer/data/mysql/kohastructure.sql M installer/data/mysql/sysprefs.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/includes/header.inc M koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt M koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt A t/db_dependent/lib/KohaTest/Koha.pm Falling back to patching base and 3-way merge... CONFLICT (modify/delete): t/db_dependent/lib/KohaTest/Koha.pm deleted in HEAD and modified in bug_8034: Restored network printer maintenance and selection. Version bug_8034: Restored network printer maintenance and selection of t/db_dependent/lib/KohaTest/Koha.pm left in tree. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/header.inc Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging circ/returns.pl Auto-merging circ/circulation.pl Auto-merging admin/branches.pl CONFLICT (content): Merge conflict in admin/branches.pl Auto-merging C4/Koha.pm Auto-merging C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Patch failed at 0001 bug_8034: Restored network printer maintenance and selection The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- 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/
