Re: [Kimchi-devel] [PATCH] [Wok] Updated Bootstrap-select library to latest version
Hi Samuel,
I was not able to apply this patch as you can see below.
Could you send it as an attachment? Probably that way, it will not get
corrupted.
[alinefm@alinefm-TP440 wok]$ git am -3
/home/alinefm/mail-patches/\[PATCH\]\ \[Wok\]\ Updated\
Bootstrap-select\ library\ to\ latest\ version.eml
Applying: Updated Bootstrap-select library to latest version
fatal: corrupt patch at line 131
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Updated Bootstrap-select library to latest version
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".
On 03/22/2016 05:09 PM, sguimaraes943(a)gmail.com wrote:
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
This patch updates Boootstrap-select files and wok customization SCSS / CSS.
This patch is mandatory to enable multiple VEPA interfaces in Kimchi.
Samuel Guimarães (1):
Updated Bootstrap-select library to latest version
ui/css/bootstrap-select.custom.css | 24 ++++++++++++++++++++++
ui/css/src/bootstrap-select.custom.scss | 21 +++++++++++++++++++
ui/js/src/wok.login.js | 4 ++--
ui/libs/bootstrap-select/LICENSE | 2 +-
.../dist/css/bootstrap-select.min.css | 6 +++---
.../dist/js/bootstrap-select.min.js | 12 +++++------
6 files changed, 57 insertions(+), 12 deletions(-)