summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rwxr-xr-xutils/installer/install.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index ad107561..90314c58 100644
--- a/README.md
+++ b/README.md
@@ -116,9 +116,13 @@ cd ~/.config/nvim && git pull
> "I have the processing power of a potato with 4 gb of ram and LunarVim runs perfectly."
> - @juanCortelezzi, LunarVim user.
+<<<<<<< HEAD
+
+=======
<div align="center">
[![Lua](https://img.shields.io/badge/Made%20with%20Lua-blue.svg?style=for-the-badge&logo=lua)]()
</div>
+>>>>>>> 68bfac0468ea4d5d7faf5bede0a4ab8cb5572f0c
diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index b94bccc2..395cec38 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -100,7 +100,7 @@ installpacker() {
cloneconfig() {
echo "Cloning LunarVim configuration"
- git clone https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
+ git clone --branch stable https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
mv $HOME/.config/nvim/utils/installer/lv-config.example.lua $HOME/.config/nvim/lv-config.lua
# mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
nvim -u $HOME/.config/nvim/init.lua +PackerInstall