https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24820 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #4 from David Nind <david@davidnind.com> --- Patch no longer applies - was going to just check that the cashup process worked. Applying: Bug 24820: Use 'date' instead of 'timestamp' for cashup Using index info to reconstruct a base tree... M Koha/Cash/Register.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Cash/Register.pm CONFLICT (content): Merge conflict in Koha/Cash/Register.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 24820: Use 'date' instead of 'timestamp' for cashup -- You are receiving this mail because: You are watching all bug changes.