[Koha-bugs] [Bug 8015] Add MARC Modifications Templates

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

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

--- Comment #16 from delaye <stephane.delaye at biblibre.com> ---
i want test the new patch in a sandbox but i have this message

Applying: Bug 8015 - Add MARC Modifications Templates
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/ImportBatch.pm
CONFLICT (content): Merge conflict in C4/ImportBatch.pm
Auto-merging C4/Koha.pm
Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql
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/includes/tools-menu.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
Auto-merging tools/stage-marc-import.pl
CONFLICT (content): Merge conflict in tools/stage-marc-import.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 8015 - Add MARC Modifications Templates
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Bug 8015 - Add MARC Modifications Templates

Bug 8015 - Add MARC Modifications Templates
Apply? [yn]
Patch left in /tmp/Bug-8015---Add-MARC-Modifications-Templates-42bN43.patch

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