From ce66cf70e78831e9d794768cbc45671da0a8d5c9 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Mon, 9 Sep 2024 19:22:48 +0200
Subject: [PATCH] Forgot to remove plugin def in old file

---
 lua/taken/plugins/otherplugins.lua | 40 +-----------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua
index 3b196f2..f20e262 100644
--- a/lua/taken/plugins/otherplugins.lua
+++ b/lua/taken/plugins/otherplugins.lua
@@ -111,7 +111,7 @@ return {
         config = function()
             local git_conflict = require("git-conflict")
 
-            git_conflict.setup({})
+            git_conflict.setup()
 
             vim.api.nvim_create_autocmd("User", {
                 pattern = "GitConflictDetected",
@@ -128,44 +128,6 @@ return {
             })
         end,
     },
-    {
-        "folke/trouble.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
-        cmd = "Trouble",
-        config = true,
-        keys = {
-            {
-                "<leader>xx",
-                "<cmd>Trouble diagnostics toggle<cr>",
-                desc = "Diagnostics (Trouble)",
-            },
-            {
-                "<leader>xX",
-                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
-                desc = "Buffer Diagnostics (Trouble)",
-            },
-            {
-                "<leader>xs",
-                "<cmd>Trouble symbols toggle focus=false<cr>",
-                desc = "Symbols (Trouble)",
-            },
-            {
-                "<leader>xl",
-                "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
-                desc = "LSP Definitions / references / ... (Trouble)",
-            },
-            {
-                "<leader>xL",
-                "<cmd>Trouble loclist toggle<cr>",
-                desc = "Location List (Trouble)",
-            },
-            {
-                "<leader>xQ",
-                "<cmd>Trouble qflist toggle<cr>",
-                desc = "Quickfix List (Trouble)",
-            },
-        },
-    },
     {
         "f-person/git-blame.nvim",
         enabled = false,