[Koha-bugs] [Bug 6150] UNIMARC field 225 plugin: allow $a value data entry

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de
       Patch Status|Needs Signoff               |Does not apply

--- Comment #2 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-06-15 13:38:21 UTC ---
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6150 UNIMARC field 225 plugin: allow $a value data entry
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 6150 UNIMARC field 225 plugin: allow $a value data
entry

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.