[Koha-bugs] [Bug 9580] Cover image from Coce, a remote image URL cache

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9580

Pierre Angot <tredok.pierre at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |tredok.pierre at gmail.com

--- Comment #2 from Pierre Angot <tredok.pierre at gmail.com> ---
Test on sandbox :

Something went wrong !
Applying: Bug 9580 Cover images from Coce, a remote image URL cache
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Auth.pm
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 9580 Cover images from Coce, a remote image URL cache
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 9580 - Cover image from Coce, a remote image URL cache

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