[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

--- Comment #30 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
pply? [(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)
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-8630---Adlibris-covers-OPAC-minified-CSS-2gtmVc.patch

-- 
You are receiving this mail because:
You are watching all bug changes.