浏览代码

Merge pull request #751 from colutti/patch-1

Removing merge tags in README.md
rebuilt 4 年之前
父节点
当前提交
2049c33dfb
共有 1 个文件被更改,包括 0 次插入5 次删除
  1. 0 5
      README.md

+ 0 - 5
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