[Koha-bugs] [Bug 8995] Show OpenURL links in OPAC search results

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #41 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
There are some conflicts - especially in the CSS files. Please fix!

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 8995: Show OpenURL links in OPAC search results
Using index info to reconstruct a base tree...
M       C4/Biblio.pm
M       installer/data/mysql/sysprefs.sql
M       installer/data/mysql/updatedatabase.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       koha-tmpl/opac-tmpl/bootstrap/css/opac.css
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
M       koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
M       koha-tmpl/opac-tmpl/bootstrap/less/opac.less
M       opac/opac-detail.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-detail.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/less/opac.less
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/less/opac.less
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/css/opac.css
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging C4/Biblio.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8995: Show OpenURL links in OPAC search results
The copy of the patch that failed is found in:
   /home/katrin/kohaclone/.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/SIGNED-OFF-Bug-8995-Show-OpenURL-links-in-OPAC-sea-AHeoX5.patch

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