http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8836
Nick Clemens <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #43 from Nick Clemens <[email protected]> --- Applying: Bug 8836 - Resurrect Rotating Collections Applying: Bug 8836 - Resurrect Rotating Collections - QA Followup Applying: Bug 8836 - Resurrect Rotating Collections - Followup 2 - Perltidy rotating collections scripts Using index info to reconstruct a base tree... <stdin>:59: trailing whitespace. "INSERT INTO collections ( colId, colTitle, colDesc ) <stdin>:211: trailing whitespace. "SELECT <stdin>:373: trailing whitespace. "DELETE FROM collections_tracking <stdin>:424: trailing whitespace. "SELECT barcode FROM items, collections_tracking <stdin>:471: trailing whitespace. "SELECT holdingbranch, colBranchcode FROM items, collections, collections_tracking warning: 5 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging rotating_collections/transferCollection.pl CONFLICT (content): Merge conflict in rotating_collections/transferCollection.pl Auto-merging rotating_collections/rotatingCollections.pl CONFLICT (content): Merge conflict in rotating_collections/rotatingCollections.pl Auto-merging rotating_collections/editCollections.pl CONFLICT (content): Merge conflict in rotating_collections/editCollections.pl Auto-merging rotating_collections/addItems.pl CONFLICT (content): Merge conflict in rotating_collections/addItems.pl Failed to merge in the changes. Patch failed at 0001 Bug 8836 - Resurrect Rotating Collections - Followup 2 - Perltidy rotating collections scripts When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-8836---Resurrect-Rotating-Collections---Follow-DX51L_.patch -- 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/
