Fix merge

2022-12-30 22:37:53 -08:00 · 2022-12-30 22:37:53 -08:00 · e1df6bc049
parent 4f7f5a3256
commit e1df6bc049
1 changed files with 0 additions and 1 deletions
--- 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;