[Koha-bugs] [Bug 8732] Add a systempreference to allow users to choose to display an icon based on the marc control fields, or based on the koha biblio level itemtype

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

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

cedric.vita at dracenie.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |cedric.vita at dracenie.com

--- Comment #12 from cedric.vita at dracenie.com ---
Something went wrong !
Applying: Bug 8732: Allowing biblio level itemtypes to display instead of MARC
ones
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/XSLT.pm
CONFLICT (content): Merge conflict in C4/XSLT.pm
Auto-merging catalogue/detail.pl
CONFLICT (content): Merge conflict in catalogue/detail.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
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
Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
Auto-merging opac/opac-detail.pl
Auto-merging opac/opac-search.pl
CONFLICT (content): Merge conflict in opac/opac-search.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 8732: Allowing biblio level itemtypes to display
instead of MARC ones
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 8732 - Add a systempreference to allow users to choose to display an icon
based on the marc control fields, or based on the koha biblio level itemtype

Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones
Apply? [yn]
Patch left in
/tmp/Bug-8732-Allowing-biblio-level-itemtypes-to-displa-sGzn56.patch

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