From 03f11a24c292eff34f90475095f8ac056f73f8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 23 Aug 2023 13:15:06 -0400
Subject: [PATCH] chore: markdown dep

---
 install/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install/package.json b/install/package.json
index b65cc0d1cb..6ca5fc4a4e 100644
--- a/install/package.json
+++ b/install/package.json
@@ -97,11 +97,7 @@
         "nodebb-plugin-dbsearch": "6.2.0",
         "nodebb-plugin-emoji": "5.1.5",
         "nodebb-plugin-emoji-android": "4.0.0",
-<<<<<<< HEAD
-        "nodebb-plugin-markdown": "12.2.2",
-=======
         "nodebb-plugin-markdown": "12.2.3",
->>>>>>> 66b84e0f4d (fix(deps): bump markdown)
         "nodebb-plugin-mentions": "4.3.4",
         "nodebb-plugin-ntfy": "1.5.0",
         "nodebb-plugin-spam-be-gone": "2.1.1",