[Koha-bugs] [Bug 23702] New UNIMARC XSLT according to last IFLA updates

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

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

--- Comment #30 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23702 - New UNIMARC XSLT according to last IFLA updates
.git/rebase-apply/patch:325: trailing whitespace.
</xsl:call-template> 
.git/rebase-apply/patch:448: trailing whitespace.
<xsl:if test="marc:datafield[@tag=531]"> 
.git/rebase-apply/patch:538: trailing whitespace.

.git/rebase-apply/patch:553: trailing whitespace.

.git/rebase-apply/patch:601: trailing whitespace.

warning: squelched 36 whitespace errors
warning: 41 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
M       koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
.git/rebase-apply/patch:325: trailing whitespace.
</xsl:call-template> 
.git/rebase-apply/patch:448: trailing whitespace.
<xsl:if test="marc:datafield[@tag=531]"> 
.git/rebase-apply/patch:538: trailing whitespace.

.git/rebase-apply/patch:553: trailing whitespace.

.git/rebase-apply/patch:601: trailing whitespace.

warning: squelched 36 whitespace errors
warning: 41 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23702 - New UNIMARC XSLT according to last IFLA
updates
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-23702---New-UNIMARC-XSLT-according-to-last-IFL-dGv0oX.patch

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