https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27945 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- On top of 27946: Applying: Bug 27945: Add tests Using index info to reconstruct a base tree... M t/db_dependent/ArticleRequests.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/ArticleRequests.t CONFLICT (content): Merge conflict in t/db_dependent/ArticleRequests.t error: Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.