https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7957
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #65 from Katrin Fischer <[email protected]> --- This is a bug with a long history :( And it currently doesn't apply, please fix: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7957: Routing lists enhancements Using index info to reconstruct a base tree... M C4/Items.pm M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt 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 members/routing-lists.pl Falling back to patching base and 3-way merge... Removing serials/routing.pl Removing serials/routing-preview.pl Removing serials/reorder_members.pl Auto-merging members/routing-lists.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. CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt deleted in Bug 7957: Routing lists enhancements and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt left in tree. Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip -- 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/
