resolve conflict

2024-07-30 21:41:27 +02:00 · 2024-07-30 21:41:27 +02:00 · 9651e80d7e
parent 7123bf8ae6
commit 9651e80d7e
1 changed files with 2 additions and 1 deletions
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@ -163,6 +163,7 @@ require('lazy').setup({
        csharp_ls = {},
        netcoredbg = {},
        clangd = {},
+        marksman = {},
        --

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