b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove git conflict marker

Browse source
This commit is contained in:
Benjamin Bädorf 2023-02-01 10:48:40 +01:00
parent d249983e20
commit 8279cb781e
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/terminal-life/nvim/lsp.vim
View file

@ -73,13 +73,9 @@ lua <<EOF
end
-- Add additional capabilities supported by nvim-cmp
<<<<<<< HEAD
local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities = require('cmp_nvim_lsp').default_capabilities()
-- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
capabilities.textDocument.completion.completionItem.snippetSupport = true
=======
local capabilities = require('cmp_nvim_lsp').default_capabilities()
>>>>>>> main
-- vscode HTML lsp needs this https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html
capabilities.textDocument.completion.completionItem.snippetSupport = true