christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

whoops merge

Browse Source
This commit is contained in:
Christian Nieves
2023-11-27 17:39:16 +00:00
parent 8162e52832
commit c3dc001d93
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vim/.vim/lua/plugins/nvim-treesitter.lua
View File

@ -64,18 +64,6 @@ return {
end end
end, end,
<<<<<<< HEAD
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights.
-- Instead of true it can also be a list of languages
additional_vim_regex_highlighting = { "java" },
},
})
end,
lazy = false,
},
=======
-- Setting this to true will run `:h syntax` and tree-sitter at the same time. -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights. -- Using this option may slow down your editor, and you may see some duplicate highlights.
@ -85,5 +73,5 @@ return {
}) })
end, end,
lazy = false, lazy = false,
>>>>>>> 3251d2e (noop the noops) },
} }