[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

I'm just a bot <gitbot at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |gitbot at bugs.koha-community.
                   |                            |org

--- Comment #6 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 9580 Cover images from Coce, a remote image URL cache
Using index info to reconstruct a base tree...
M    C4/Auth.pm
M   
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
M    koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
M    koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
M    koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
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 C4/Auth.pm
Patch failed at 0001 Bug 9580 Cover images from Coce, a remote image URL cache
The copy of the patch that failed is found in:
   /home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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