https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30409
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #16 from David Nind <[email protected]> --- Hi Peter. I was too slow retesting, as the patch no longer applies 8-(... git bz apply 30409 Bug 30409 - barcodedecode() should always trim barcode 135453 - Bug 30409: barcodedecode() should always trim barcode Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 30409: barcodedecode() should always trim barcode .git/rebase-apply/patch:18: trailing whitespace. For proper functioning of this filter, calling the function on the .git/rebase-apply/patch:22: trailing whitespace. The optional $filter argument is to allow for testing or explicit .git/rebase-apply/patch:23: trailing whitespace. behavior that ignores the System Pref. Valid values are the same as the warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M course_reserves/add_items.pl .git/rebase-apply/patch:18: trailing whitespace. For proper functioning of this filter, calling the function on the .git/rebase-apply/patch:22: trailing whitespace. The optional $filter argument is to allow for testing or explicit .git/rebase-apply/patch:23: trailing whitespace. behavior that ignores the System Pref. Valid values are the same as the warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging course_reserves/add_items.pl CONFLICT (content): Merge conflict in course_reserves/add_items.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 30409: barcodedecode() should always trim barcode -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
