[Koha-bugs] [Bug 14100] Generic solution for language overlay

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #20 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Sorry, patch no longer applies, can you please fix?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14100: Generic solution for language overlay - Item types
Using index info to reconstruct a base tree...
M       C4/Items.pm
M       cataloguing/additem.pl
M       installer/data/mysql/kohastructure.sql
M       tools/batchMod.pl
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
        installer/data/mysql/atomicupdate/Bug_14100-add_table_localization.sql
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 14100: Generic solution for language overlay - Item
types
The copy of the patch that failed is found in:
   /home/katrin/kohaclone/.git/rebase-apply/patch
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".
Patch left in
/tmp/Bug-14100-Generic-solution-for-language-overlay----vNN_6L.patch

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