[Koha-bugs] [Bug 32680] Add hooks to allow cover images to be provided by plugins

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32680

--- Comment #23 from Sally <sally.healey at cheshiresharedservices.gov.uk> ---
Sorry Matt, I'm still getting the same error:

148129 - Bug 32680: (follow-up) Add new plugin hook and reformat data
structures

Applying: Bug 32680: Add hooks to allow cover art to come from plugins
.git/rebase-apply/patch:74: trailing whitespace.
            var normalized_isbn = "[% normalized_isbn %]";   
.git/rebase-apply/patch:118: trailing whitespace.
            [% END %]   
.git/rebase-apply/patch:143: trailing whitespace.
            var normalized_isbn = "[% normalized_isbn %]";   
.git/rebase-apply/patch:180: trailing whitespace.
            [% END %]   
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
.git/rebase-apply/patch:74: trailing whitespace.
            var normalized_isbn = "[% normalized_isbn %]";   
.git/rebase-apply/patch:118: trailing whitespace.
            [% END %]   
.git/rebase-apply/patch:143: trailing whitespace.
            var normalized_isbn = "[% normalized_isbn %]";   
.git/rebase-apply/patch:180: trailing whitespace.
            [% END %]   
warning: 4 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.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
error: Failed to merge in the changes.
Patch failed at 0001 Bug 32680: Add hooks to allow cover art to come from
plugins

I can leave it for someone else to try, see if they get the same error?

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