fix: Fix merge conflicts

nvim/m-housh/lua/user/plugin/swift.lua

@@ -1,15 +1,16 @@
 return {
-    'm-housh/swift.nvim',
-    dependencies = {
-      'akinsho/toggleterm.nvim'
-    },
-    ft = { 'swift' },
-    config = function()
-      require('swift').setup()
-      local default_options = { noremap = true, silent = true }
-      local actions = require('swift.actions')
-
-      vim.keymap.set('n', '<C-b>', actions.build, default_options)
-      vim.keymap.set('n', '<C-S-U>', actions.test, default_options)
-    end
-  }
+	"m-housh/swift.nvim",
+	dependencies = {
+		"akinsho/toggleterm.nvim",
+	},
+	ft = { "swift" },
+	config = function()
+		require("swift").setup()
+		local default_options = { noremap = true, silent = true }
+		local actions = require("swift.actions")
+		vim.opt.tabstop = 2
+		vim.opt.shiftwidth = 2
+		vim.keymap.set("n", "<C-b>", actions.build, default_options)
+		vim.keymap.set("n", "<C-S-U>", actions.test, default_options)
+	end,
+}

nvim/m-housh/lua/user/plugin/trouble.lua

@@ -3,7 +3,9 @@ return {
 	dependencies = { "nvim-tree/nvim-web-devicons" },
 	event = { "BufReadPre", "BufNewFile" },
 	keys = {
-		{ "<leader>tt", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
+		{ "<leader>t", "<cmd>Trouble diagnostics toggle<cr>", { desc = "[T]rouble diagnostics" } },
+		{ "<leader>tq", "<cmd>Trouble quickfix toggle<cr>", { desc = "Open a quickfix" } },
+		{ "<leader>tl", "<cmd>Trouble loclist toggle<cr>", { desc = "[T]rouble [L]ocation list" } },
 	},
 
 	opts = {},