From e1df6bc0493d6759a7e52b594e254811f9c37fe8 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius@meedan.com>
Date: Fri, 30 Dec 2022 22:37:53 -0800
Subject: [PATCH] Fix merge

---
 app/javascript/styles/macaron/diff.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index da67c5989..47853a21e 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -1169,7 +1169,6 @@ button.icon-button.disabled i.fa-retweet {
   }
 }
 
-<<<<<<< HEAD
 #navigation-panel__publish {
   i {
     color: $ui-base-lighter-color;