https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7957
David Nind <da...@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |da...@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #90 from David Nind <da...@davidnind.com> --- Sorry, the patch no longer applies 8-(... Applying: Bug 7957: Routing lists enhancements .git/rebase-apply/patch:146: trailing whitespace. FROM serial warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/Serials.pm M installer/data/mysql/kohastructure.sql M serials/routing-preview.pl .git/rebase-apply/patch:146: trailing whitespace. FROM serial warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Removing serials/routing.pl CONFLICT (modify/delete): serials/routing-preview.pl deleted in Bug 7957: Routing lists enhancements and modified in HEAD. Version HEAD of serials/routing-preview.pl left in tree. Removing serials/reorder_members.pl Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Serials.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 7957: Routing lists enhancements -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/