[Koha-bugs] [Bug 26368] Add support for OCLC Encoding level values

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26368

David Nind <david at davidnind.com> changed:

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

--- Comment #5 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

git bz apply 26368

Bug 26368 - Add support for OCLC Encoding level values

120209 - Bug 26368: Add OCLC options to marc21_leader.tt

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26368: Add OCLC options to marc21_leader.tt
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/sysprefs.sql
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
M      
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/mandatory/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26368: Add OCLC options to marc21_leader.tt

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