https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21073 Liz Rea <wizzyrea@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |wizzyrea@gmail.com --- Comment #11 from Liz Rea <wizzyrea@gmail.com> --- Terribly sorry to report that this no longer applies: Auto-merging t/db_dependent/Plugins.t CONFLICT (content): Merge conflict in t/db_dependent/Plugins.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt error: Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.