http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13941 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #16 from Marc Véron <veron@veron.ch> --- Patch 2/2 does not apply on current master because koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/receipt.tt no longer exists. Applying: Bug 13941 [2/2] Fix <body> tags missing id/class Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: refusing to lose untracked file at 'koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/receipt.tt' CONFLICT (modify/delete): koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/receipt.tt deleted in HEAD and modified in Bug 13941 [2/2] Fix <body> tags missing id/class. Version Bug 13941 [2/2] Fix <body> tags missing id/class of koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/receipt.tt left in tree. -- You are receiving this mail because: You are watching all bug changes.