From 9651e80d7e649012ef669ffa9122a3151aca831e Mon Sep 17 00:00:00 2001
From: TheSoeren <imhofabian@gmail.com>
Date: Tue, 30 Jul 2024 21:41:27 +0200
Subject: [PATCH] resolve conflict

---
 lua/plugins.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/plugins.lua b/lua/plugins.lua
index c260f0bd..c0270ad6 100644
--- 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" },
         --