From c3dc001d938d7e257608c597a0c04a8a11fa6858 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Mon, 27 Nov 2023 17:39:16 +0000 Subject: [PATCH] whoops merge --- vim/.vim/lua/plugins/nvim-treesitter.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/vim/.vim/lua/plugins/nvim-treesitter.lua b/vim/.vim/lua/plugins/nvim-treesitter.lua index d9f8c63..04d1502 100644 --- a/vim/.vim/lua/plugins/nvim-treesitter.lua +++ b/vim/.vim/lua/plugins/nvim-treesitter.lua @@ -64,26 +64,14 @@ return { 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" }, + additional_vim_regex_highlighting = { "java", "kotlin" }, }, }) end, lazy = false, }, -======= - -- 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", "kotlin" }, - }, - }) - end, - lazy = false, ->>>>>>> 3251d2e (noop the noops) }