https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28371 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #17 from David Nind <david@davidnind.com> --- I've confirmed that I didn't actually apply the patches - as the patch no longer applies .... (it must be Friday!): Bug 28371 - Improve performance of XSLTParse4Display 124086 - Bug 28371: Unit tests 124087 - Bug 28371: Passpreviously fetched branches and itemtypes through and fetch all needed AV at once Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28371: Unit tests Using index info to reconstruct a base tree... M t/db_dependent/XSLT.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/XSLT.t CONFLICT (content): Merge conflict in t/db_dependent/XSLT.t error: Failed to merge in the changes. Patch failed at 0001 Bug 28371: Unit tests -- You are receiving this mail because: You are watching all bug changes.