From b879949ecdebd56d8e02b0cb71420919c7942d7e Mon Sep 17 00:00:00 2001 From: Felix Zeller Date: Sat, 24 Feb 2024 23:26:11 -0500 Subject: [PATCH] Remove conflict marker --- lua/lspconfig/server_configurations/markdown_oxide.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/lspconfig/server_configurations/markdown_oxide.lua b/lua/lspconfig/server_configurations/markdown_oxide.lua index 64e49e1a04..1e58f2d961 100644 --- 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 ]], }, }