Katrin Fischer <> changed:

           What    |Removed                     |Added
                 CC|                            |

--- Comment #27 from Katrin Fischer <> ---
There is a conflict in the OPAC minified CSS:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 8630 - Adlibris covers (OPAC minified CSS)
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/css/opac.css
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css
CONFLICT (content): Merge conflict in
error: Failed to merge in the changes.
Patch failed at 0001 Bug 8630 - Adlibris covers (OPAC minified CSS)

Leaving this Needs Signoff, someone familiar with the process could recompile
before testing.

You are receiving this mail because:
You are watching all bug changes.
Koha-bugs mailing list
website :
git :
bugs :

Reply via email to