Cleaned up merge conflict remnantsHEADmain

1 files changed, 0 insertions, 23 deletions

diff --git a/lua/talha/lazy.lua b/lua/talha/lazy.lua
index b984c54..4d7d798 100644
--- a/lua/talha/lazy.lua
+++ b/lua/talha/lazy.lua
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-
 require("lazy").setup({
   { "nvim-lua/plenary.nvim" },
   {
@@ -47,27 +45,6 @@ require("lazy").setup({
       {'L3MON4D3/LuaSnip'},     -- Required
     }
   },
-=======
-      {'hrsh7th/cmp-nvim-lua'},
-      {'L3MON4D3/LuaSnip'},     -- Required
-    }
-  },
-  {
-    "kristijanhusak/vim-dadbod-ui",
-    dependencies = {
-      { 'tpope/vim-dadbod', lazy = true },
-      { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true },
-    },
-    cmd = {
-      'DBUI',
-      'DBUIToggle',
-      'DBUIAddConnection',
-      'DBUIFindBuffer'
-    },
-    init = function()
-      vim.g.db_ui_use_nerd_fonts = 1
-    end,
-  }
   --- @DISABLED
   -- "mbbill/undotree",
 })