Remove conflict marker

neovim · Feb 25, 2024 · b879949 · b879949
1 parent 10a1ec3
commit b879949
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/lua/lspconfig/server_configurations/markdown_oxide.lua b/lua/lspconfig/server_configurations/markdown_oxide.lua
@@ -13,7 +13,6 @@ https://github.com/Feel-ix-343/markdown-oxide
 Markdown language server with advanced linking support made to be completely compatible with Obsidian; An Obsidian Language Server
 
 Check the readme to see how to get nvim-cmp properly working.
-<<<<<<< HEAD
     ]],
   },
 }