https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8630
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |katrin.fisc...@bsz-bw.de
--- Comment #27 from Katrin Fischer <katrin.fisc...@bsz-bw.de> ---
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
koha-tmpl/opac-tmpl/bootstrap/css/opac.css
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
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
