[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

I'm just a bot <gitbot at bugs.koha-community.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |gitbot at bugs.koha-community.
                   |                            |org
   When did the bot|                            |2013-10-28
    last check this|                            |

--- Comment #19 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 8732: Allowing biblio level itemtypes to display instead of MARC
ones
Using index info to reconstruct a base tree...
M    installer/data/mysql/sysprefs.sql
M    installer/data/mysql/updatedatabase.pl
M    opac/opac-detail.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-detail.pl
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Patch failed at 0001 Bug 8732: Allowing biblio level itemtypes to display
instead of MARC ones
The copy of the patch that failed is found in:
   /home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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