https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11999
Magnus Enger <mag...@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |mag...@libriotech.no --- Comment #66 from Magnus Enger <mag...@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. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/