Remove missed merge conflicts, Removed double oil.lua plugin file

2024-09-29 23:05:10 +02:00
parent a268731f19
commit 74937605ef
3 changed files with 73 additions and 48 deletions
--- a/lua/barink/plugins/vim-dadbod.lua
+++ b/lua/barink/plugins/vim-dadbod.lua
@@ -1,9 +1,3 @@
 return {
-<<<<<<< HEAD
-    'tpope/vim-dadbod',
-    }
-
-=======
    "tpope/vim-dadbod",
 }
->>>>>>> Windows