<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hi Samuel,<br>
<br>
I could not apply those patches:<br>
<br>
[alinefm@alinefm-TP440 wok]$ git am -3
/home/alinefm/mail-patches/\[PATCH\ *<br>
Applying: Minor fixes in form fields<br>
Applying: Icons for Kimchi issue #606<br>
<b>fatal: corrupt patch at line 320</b><br>
Repository lacks necessary blobs to fall back on 3-way merge.<br>
Cannot fall back to three-way merge.<br>
Patch failed at 0002 Icons for Kimchi issue #606<br>
The copy of the patch that failed is found in:<br>
/home/alinefm/wok/.git/rebase-apply/patch<br>
When you have resolved this problem, run "git am --continue".<br>
If you prefer to skip this patch, run "git am --skip" instead.<br>
To restore the original branch and stop patching, run "git am
--abort".<br>
<br>
Could you send it attach, please? Seems it got corrupted.<br>
<br>
Regards,<br>
Aline Manera<br>
<br>
<br>
<div class="moz-cite-prefix">On 08/30/2016 04:14 PM,
<a class="moz-txt-link-abbreviated" href="mailto:sguimaraes943@gmail.com">sguimaraes943@gmail.com</a> wrote:<br>
</div>
<blockquote
cite="mid:1472584500-19243-1-git-send-email-sguimaraes943@gmail.com"
type="cite">
<pre wrap="">From: Samuel Guimarães <a class="moz-txt-link-rfc2396E" href="mailto:sguimaraes943@gmail.com"><sguimaraes943@gmail.com></a>
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
</pre>
</blockquote>
<br>
</body>
</html>