summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorchristianchiarulli <[email protected]>2021-07-07 00:23:53 -0400
committerchristianchiarulli <[email protected]>2021-07-07 00:23:53 -0400
commit2fd8b93ada6eb34875fa57da17ee5534ee631801 (patch)
treee5b72e2d5b8f6d152f859fa055fd4ae4c061973f /README.md
parent15da3c2005ef36a6ccf11bcc84a3eafa0d1e462e (diff)
parent7df60c78ec5876a95716a7555fbb857e14dbea66 (diff)
Merge branch 'stable' of github.com:ChristianChiarulli/LunarVim
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 4 insertions, 0 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