https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21330 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #17 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This one does not apply for me, I haven't seen that error before: Applying: Bug 21330: Allow XSLT for authority detail view in OPAC Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: installer/data/mysql/atomicupdate/bug-21330.pl Please move or remove them before you merge. Aborting error: Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.