https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37841 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@gmail.com Status|Signed Off |Patch doesn't apply --- Comment #6 from Jonathan Druart <jonathan.druart@gmail.com> --- To test bug 36337 I need to apply bug 37833 and this one, but I get a conflict: Bug 36337 Depends on bug 37833 (Signed Off) Follow? [(y)es, (n)o] Bug 37833 - Incorrect logic controlling display of OPAC language selection menus 171154 - Bug 37833: Incorrect logic controlling display of OPAC language selection menus Applying: Bug 37833: Incorrect logic controlling display of OPAC language selection menus Apply? [(y)es, (n)o, (i)nteractive] Bug 36337 Depends on bug 37841 (Signed Off) Follow? [(y)es, (n)o] Bug 37841 - Switch OPAC language menu alignment in header and footer 171230 - Bug 37841: Switch OPAC language menu alignment in header and footer Applying: Bug 37841: Switch OPAC language menu alignment in header and footer Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/langmenu.inc -- You are receiving this mail because: You are watching all bug changes.