[Koha-bugs] [Bug 17385] Add custom export formats for bibliographic records

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #119 from David Nind <david at davidnind.com> ---
Apologies, I was too slow to retest - the patches no longer apply 8-(..

Applying: Bug 17385: Add custom export XSLT
.git/rebase-apply/patch:163: trailing whitespace.
} else { 
.git/rebase-apply/patch:166: trailing whitespace.
    $template->param(bib_list => $bib_list); 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       basket/basket.pl
M       basket/downloadcart.pl
M       catalogue/detail.pl
M       catalogue/export.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       opac/opac-detail.pl
M       opac/opac-downloadcart.pl
M       opac/opac-downloadshelf.pl
M       opac/opac-export.pl
M       virtualshelves/downloadshelf.pl
M       virtualshelves/shelves.pl
.git/rebase-apply/patch:163: trailing whitespace.
} else { 
.git/rebase-apply/patch:166: trailing whitespace.
    $template->param(bib_list => $bib_list); 
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging virtualshelves/shelves.pl
Auto-merging virtualshelves/downloadshelf.pl
Auto-merging opac/opac-export.pl
CONFLICT (content): Merge conflict in opac/opac-export.pl
Auto-merging opac/opac-downloadshelf.pl
CONFLICT (content): Merge conflict in opac/opac-downloadshelf.pl
Auto-merging opac/opac-downloadcart.pl
CONFLICT (content): Merge conflict in opac/opac-downloadcart.pl
Auto-merging opac/opac-detail.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging catalogue/export.pl
Auto-merging catalogue/detail.pl
Auto-merging basket/downloadcart.pl
Auto-merging basket/basket.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 17385: Add custom export XSLT

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