https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30418 Hammat wele <hammat.wele@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |hammat.wele@inlibro.com --- Comment #10 from Hammat wele <hammat.wele@inlibro.com> --- CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc error: Failed to merge in the changes.Patch failed at 0001 Bug 30418: Template and JavaScript changes -- You are receiving this mail because: You are watching all bug changes.