fix: Fix merge conflicts

This commit is contained in:
2024-11-20 22:07:02 -05:00
parent eed9c143ea
commit d9ea8d80c6
5 changed files with 30 additions and 19 deletions

View File

@@ -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,
}