http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10860
I'm just a bot <git...@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot|2013-09-29 00:00:00 |2013-10-28 last check this| | --- Comment #13 from I'm just a bot <git...@bugs.koha-community.org> --- Applying: Bug 10860: In-House Use Using index info to reconstruct a base tree... M C4/Circulation.pm M C4/Items.pm M circ/circulation.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/css/staff-global.css M koha-tmpl/intranet-tmpl/prog/en/js/datatables.js M koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/datatables.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging circ/circulation.pl Auto-merging C4/Items.pm Auto-merging C4/Circulation.pm Patch failed at 0001 Bug 10860: In-House Use 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 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/