From 5c50899e8389d0ec80ae5f8a6e79201c1aff1437 Mon Sep 17 00:00:00 2001
From: Ilia Timofeev <ilia.timofeev@gmail.com>
Date: Fri, 30 Jun 2023 09:41:37 +0000
Subject: [PATCH] fix merge error

---
 client/components/editor/editor-markdown.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/editor/editor-markdown.vue b/client/components/editor/editor-markdown.vue
index 7a27035620..f08ee7ac18 100644
--- a/client/components/editor/editor-markdown.vue
+++ b/client/components/editor/editor-markdown.vue
@@ -1171,6 +1171,7 @@ export default {
 </script>
 
 <style lang='scss'>
+@import '../../scss/joan-styles.scss';
 
 $editor-height: calc(100vh - 112px - 24px);
 $editor-height-mobile: calc(100vh - 112px - 16px);