https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36135 Emmi Takkinen <emmi.takkinen@koha-suomi.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #98 from Emmi Takkinen <emmi.takkinen@koha-suomi.fi> --- There was something wrong with patches I had in my development branch, they applied cleanly against current main. But after creating a new clean branch and applying patches from Bugzilla I got same merge conflict as Andrew. I had also dropped one of the patches at some point. These should now apply, but I was wondering do they still need some clean up to match changes made for tidying up the whole code base (bug 38664). -- You are receiving this mail because: You are watching all bug changes.