[Kimchi-devel] [PATCH] Moving bootstra-select js and css to separate folders

[Aline Manera]

I was not able to apply this patch. Seems it is corrupted.

alinefm at alinefm-ThinkPad-T440:~/kimchi$ git am -3 
../mail-patches/\[PATCH\]\ Moving\ bootstrap-select\ js\ and\ css\ to\ 
separate\ folders.eml
Applying: Moving bootstrap-select js and css to separate folders
fatal: corrupt patch at line 91
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Moving bootstrap-select js and css to separate folders
The copy of the patch that failed is found in:
    /home/alinefm/kimchi/.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 resend, please?


On 06/10/2015 11:24, sguimaraes943 at gmail.com wrote:
> From: samhenri <samuel.guimaraes at eldorado.org.br>
>
> Added Bootstrap-select original CSS and moved to ui/libs folder.
> Also changed folder structure and separated js files from css.
> Updated makefiles and configure.ac to support changes listed above.
>
> samhenri (1):
>    Moving bootstrap-select js and css to separate folders
>
>   configure.ac                                       |  3 +++
>   ui/libs/bootstrap-select/Makefile.am               |  4 +---
>   ui/libs/bootstrap-select/bootstrap-select.min.js   |  8 --------
>   ui/libs/bootstrap-select/dist/Makefile.am          | 20 ++++++++++++++++++++
>   ui/libs/bootstrap-select/dist/css/Makefile.am      | 22 ++++++++++++++++++++++
>   .../dist/css/bootstrap-select.min.css              |  6 ++++++
>   ui/libs/bootstrap-select/dist/js/Makefile.am       | 22 ++++++++++++++++++++++
>   .../dist/js/bootstrap-select.min.js                |  8 ++++++++
>   8 files changed, 82 insertions(+), 11 deletions(-)
>   delete mode 100644 ui/libs/bootstrap-select/bootstrap-select.min.js
>   create mode 100644 ui/libs/bootstrap-select/dist/Makefile.am
>   create mode 100644 ui/libs/bootstrap-select/dist/css/Makefile.am
>   create mode 100644 ui/libs/bootstrap-select/dist/css/bootstrap-select.min.css
>   create mode 100644 ui/libs/bootstrap-select/dist/js/Makefile.am
>   create mode 100644 ui/libs/bootstrap-select/dist/js/bootstrap-select.min.js
>