Merging Windows into main

2024-09-29 22:58:27 +02:00
parent 430a2879e9 98dd2510c9
commit a268731f19
35 changed files with 491 additions and 316 deletions
--- a/lua/barink/plugins/vim-dadbod.lua
+++ b/lua/barink/plugins/vim-dadbod.lua
@@ -1,4 +1,9 @@
 return {
+<<<<<<< HEAD
    'tpope/vim-dadbod',
    }

+=======
+    "tpope/vim-dadbod",
+}
+>>>>>>> Windows