Hi Samuel, I could not apply those patches: [alinefm@alinefm-TP440 wok]$ git am -3 /home/alinefm/mail-patches/\[PATCH\ * Applying: Minor fixes in form fields Applying: Icons for Kimchi issue #606 *fatal: corrupt patch at line 320* Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0002 Icons for Kimchi issue #606 The copy of the patch that failed is found in: /home/alinefm/wok/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Could you send it attach, please? Seems it got corrupted. Regards, Aline Manera On 08/30/2016 04:14 PM, sguimaraes943@gmail.com wrote:
From: Samuel Guimarães <sguimaraes943@gmail.com>
Patches required for issues #606 and #939
Samuel Guimarães (2): Minor fixes in form fields Icons for Kimchi issue #606
ui/css/src/modules/_wok-forms.scss | 11 +++ ui/css/wok.css | 11 +++ ui/images/theme-default/file-o-img.svg | 149 +++++++++++++++++++++++++++++++++ ui/images/theme-default/file-o-iso.svg | 149 +++++++++++++++++++++++++++++++++ 4 files changed, 320 insertions(+) create mode 100644 ui/images/theme-default/file-o-img.svg create mode 100644 ui/images/theme-default/file-o-iso.svg