summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Colucci <[email protected]>2021-07-07 09:53:54 +0200
committerGitHub <[email protected]>2021-07-07 09:53:54 +0200
commitbf2d195745784ac0b9eec5ca968fb1900f22358f (patch)
tree5c23af75938cadde40756f17ce00d2bbbe38eab1
parentcd7da503505d6707fbe9f674e8b75fed00f1e690 (diff)
Removing merge tags
-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