https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27631 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr Status|Needs Signoff |Patch doesn't apply --- Comment #16 from Séverine Queune <severine.queune@bulac.fr> --- I just had this conflict applying patch on master : CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss error: Failed to merge in the changes. Patch failed at 0001 Bug 27631: Changed <h1> around logo to <div> -- You are receiving this mail because: You are watching all bug changes.