[Koha-bugs] [Bug 6138] Show local help and isbd punctuation automatically when we are cataloguing

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

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

Chris Cormack <chris at bigballofwax.co.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |chris at bigballofwax.co.nz

--- Comment #5 from Chris Cormack <chris at bigballofwax.co.nz> ---
Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
Auto-merging installer/data/mysql/kohastructure.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/js/staff-global.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
Failed to merge in the changes.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-bugs/attachments/20120303/1176f25e/attachment.htm>