Re: [Kimchi-devel] [PATCH 0/2] Remove useless files
Aline, in my mail box, see below, patch 1/2 is missing.
Only apply patch 2/2 failed.
[root@oc7075156026 kimchi]# git am
/root/Desktop/patch-mail/jquery/\[Kimchi-devel\]\ \[PATCH\ 2_2\]\
Remove\ useless\ jquery\ files.eml
Applying: Remove useless jquery files
fatal: corrupt patch at line 15123
Patch failed at 0001 Remove useless jquery files
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".
On 8/1/2014 12:54 PM, Aline Manera wrote:
Aline Manera (2):
Remove useless image files
Remove useless jquery files
contrib/kimchi.spec.fedora.in | 2 -
contrib/kimchi.spec.suse.in | 2 -
ui/images/progressing.gif | Bin 1152 -> 0 bytes
ui/images/theme-default/bg-black-linen.png | Bin 84780 -> 0 bytes
ui/images/theme-default/bg-navbar.png | Bin 3043 -> 0 bytes
ui/js/jquery-ui.js | 14936 ---------------------------
ui/js/jquery.min.js | 5 -
7 files changed, 14945 deletions(-)
delete mode 100644 ui/images/progressing.gif
delete mode 100644 ui/images/theme-default/bg-black-linen.png
delete mode 100644 ui/images/theme-default/bg-navbar.png
delete mode 100644 ui/js/jquery-ui.js
delete mode 100644 ui/js/jquery.min.js
Attachments:
- hfaiiihc.png (image/png — 3.4 KB)
- attachment.html (text/html — 2.0 KB)
