mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

This commit is contained in:
TheSoeren 2024-07-30 21:41:27 +02:00
parent 7123bf8ae6
commit 9651e80d7e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/plugins.lua
View File

@ -163,6 +163,7 @@ require('lazy').setup({
csharp_ls = {}, csharp_ls = {},
netcoredbg = {}, netcoredbg = {},
clangd = {}, clangd = {},
marksman = {},
-- --
lua_ls = { lua_ls = {
@ -270,7 +271,7 @@ require('lazy').setup({
json = { 'prettier' }, json = { 'prettier' },
scss = { 'prettier' }, scss = { 'prettier' },
html = { 'prettier' }, html = { 'prettier' },
markdown = { 'prettier' },
-- Conform can also run multiple formatters sequentially -- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" }, -- python = { "isort", "black" },
-- --