[Koha-bugs] [Bug 14304] RDA: Display link in XSLT for 264 field to reflect Zebra indexing

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

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

Nick Clemens <nick at bywatersolutions.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |nick at bywatersolutions.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #2 from Nick Clemens <nick at bywatersolutions.com> ---
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
Failed to merge in the changes.

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