https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999 Arthur Suzuki <arthur.suzuki@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Pushed for QA --- Comment #72 from Arthur Suzuki <arthur.suzuki@biblibre.com> --- (In reply to Magnus Enger from comment #66)

attachment 88300 [details] [review] has merge markers (<<<<) in it. Maybe the rebase was not complete?

Thanks for pointing that out :) did a re-rebase and re-upload, everything applies fine now (still asking for QA though) -- You are receiving this mail because: You are watching all bug changes.