https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17229 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #37 from David Nind <david@davidnind.com> --- Patch no longer applies Applying: Bug 17229: Add unit test for BlockExpiredPatronOpacActions check .git/rebase-apply/patch:41: space before tab in indent. dateexpiry => '2000-01-01', warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M t/db_dependent/Holds.t .git/rebase-apply/patch:41: space before tab in indent. dateexpiry => '2000-01-01', .git/rebase-apply/patch:56: new blank line at EOF. + warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Holds.t CONFLICT (content): Merge conflict in t/db_dependent/Holds.t error: Failed to merge in the changes. Patch failed at 0001 Bug 17229: Add unit test for BlockExpiredPatronOpacActions check -- You are receiving this mail because: You are watching all bug changes.