[Koha-bugs] [Bug 8630] Add covers from AdLibris to the OPAC and Intranet

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8630

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #27 from Katrin Fischer <katrin.fischer at 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.