http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7957
I'm just a bot <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot|2013-09-24 00:00:00 |2013-10-25 last check this| | --- Comment #18 from I'm just a bot <[email protected]> --- Applying: Bug 7957: Routing lists enhancements Using index info to reconstruct a base tree... M C4/Items.pm M C4/Serials.pm M installer/data/mysql/kohastructure.sql M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt M serials/routing.pl Falling back to patching base and 3-way merge... CONFLICT (modify/delete): serials/routing.pl deleted in Bug 7957: Routing lists enhancements and modified in HEAD. Version HEAD of serials/routing.pl left in tree. Removing serials/routing-preview.pl Removing serials/reorder_members.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt deleted in Bug 7957: Routing lists enhancements and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt left in tree. Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Serials.pm Auto-merging C4/Items.pm Patch failed at 0001 Bug 7957: Routing lists enhancements 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/
