https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999 Magnus Enger <magnus@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |magnus@libriotech.no --- Comment #66 from Magnus Enger <magnus@libriotech.no> --- attachment 88300 has merge markers (<<<<) in it. Maybe the rebase was not complete? -- You are receiving this mail because: You are watching all bug changes.