From 26161cefcda38711c7c8e166ccca7478bcaf18f4 Mon Sep 17 00:00:00 2001
From: talha <talha@talhaamir.xyz>
Date: Fri, 10 Jan 2025 15:05:35 +0500
Subject: Cleaned up merge conflict remnants
---
after/plugin/lsp.lua | 12 ++++++------
lua/talha/lazy.lua | 23 -----------------------
2 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index 41e7870..c806032 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -117,9 +117,9 @@ cmp.setup({
},
})
-cmp.setup.filetype({ 'sql' }, {
- sources = {
- { name = 'vim-dadbod-completion' },
- { name = 'buffer'},
- },
-})
+--cmp.setup.filetype({ 'sql' }, {
+-- sources = {
+-- { name = 'vim-dadbod-completion' },
+-- { name = 'buffer'},
+-- },
+--})
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",
})
--
cgit v1.2.3