Fix merge conflict

This commit is contained in:
Alex Selimov 2024-05-16 22:28:52 -04:00
commit 470525c4e5
2 changed files with 8 additions and 6 deletions

View file

@ -262,8 +262,8 @@ require("lazy").setup({
repl_open_cmd = "horizontal bot 20 split"
end,
},
"vigoux/ltex-ls.nvim",
"tpope/vim-markdown",
"ixru/nvim-markdown",
"KeitaNakamura/tex-conceal.vim",
"christoomey/vim-tmux-navigator",
"skywind3000/asyncrun.vim",
-- NOTE: Plugins can specify dependencies.
@ -272,7 +272,6 @@ require("lazy").setup({
-- you do for a plugin at the top level, you can do for a dependency.
--
-- Use the `dependencies` key to specify the dependencies of a particular plugin
{ -- Fuzzy Finder (files, lsp, etc)
"nvim-telescope/telescope.nvim",
event = "VeryLazy",