[Koha-bugs] [Bug 11319] Marc modification templates improvements

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

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

cedric.vita at dracenie.com changed:

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

--- Comment #11 from cedric.vita at dracenie.com ---
The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 11319:
<h1>Something went wrong !</h1>Applying: Bug 11319: Koha::SimpleMARC should
take a
hashref for parameters
Applying: Bug 11319: Add UT for the fields management
Applying: Bug 11319: Add the field management for Koha::SimpleMARC
Applying: Bug 11319: Add specific UT for nonexistent field/subfield
Applying: Bug 11319: Template modifications
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/tools/marc_modification_templates.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 11319: Template modifications
When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 11319 - Marc modification templates improvements

23415 - Bug 11319: Koha::SimpleMARC should take a hashref for parameters
23416 - Bug 11319: Add UT for the fields management
23417 - Bug 11319: Add the field management for Koha::SimpleMARC
23418 - Bug 11319: Add specific UT for nonexistent field/subfield
23419 - Bug 11319: Template modifications

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-11319-Template-modifications-Yo0tWr.patch

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