summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md5
1 files changed, 0 insertions, 5 deletions
diff --git a/README.md b/README.md
index 192f9721..972dd70b 100644
--- a/README.md
+++ b/README.md
@@ -131,13 +131,8 @@ 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