[Koha-bugs] [Bug 11358] Use Amazon's HTTPS URLs for covers when using HTTPS in Koha.

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

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

Mirko Tietgen <mirko at abunchofthings.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mirko at abunchofthings.net

--- Comment #10 from Mirko Tietgen <mirko at abunchofthings.net> ---
This needs a rebase.

Applying: Bug: 11358 - Use HTTPS Amazon images when Koha is using HTTPS.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug: 11358 - Use HTTPS Amazon images when Koha is using
HTTPS.

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