[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

Cab Vinton <bibliwho at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bibliwho at gmail.com

--- Comment #49 from Cab Vinton <bibliwho at gmail.com> ---
Patch failed in PTFS Sandbox 0:

The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 8630:
<h1>Something went wrong !</h1>Applying: Bug 8630 - Adlibris covers (syspref
files)
Applying: Bug 8630 - Adlibris covers (intranet templates)
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Applying: Bug 8630 - Adlibris covers (intranet CSS)
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Patch failed at 0001 Bug 8630 - Adlibris covers (intranet 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.
Bug 8630 - Add covers from AdLibris to the OPAC and Intranet

76848 - Bug 8630 - Adlibris covers (syspref files)
76849 - Bug 8630 - Adlibris covers (intranet templates)
76850 - Bug 8630 - Adlibris covers (intranet CSS)
76851 - Bug 8630 - Adlibris covers (OPAC templates)
76852 - Bug 8630 - Adlibris covers (OPAC less changes)
76853 - Bug 8630: [FOLLOW-UP] Make Adlibris cover show on OPAC overdues tab
76859 - Bug 8630: Regenerated minified OPAC CSS

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-8630---Adlibris-covers-intranet-CSS-11sz87.patch

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