From 75e826f47c591892c58ee61a88c1b4450fe6ee9b Mon Sep 17 00:00:00 2001
From: Nico de Haen <ndh@deltachat.de>
Date: Fri, 28 Feb 2025 16:35:14 +0100
Subject: [PATCH] Fix conflict after rebase

---
 packages/frontend/scss/message/_message.scss | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/scss/message/_message.scss b/packages/frontend/scss/message/_message.scss
index 80d38cbad6..8f484dd47f 100644
--- a/packages/frontend/scss/message/_message.scss
+++ b/packages/frontend/scss/message/_message.scss
@@ -649,16 +649,12 @@
         @include color-svg('./images/map-marker.svg', white, 100%);
       }
 
-<<<<<<< HEAD
-      & > .date,
-      & > .edited {
-=======
       & > .saved-message-icon {
         @include color-svg('./images/icons/bookmark-filled.svg', white, 100%);
       }
 
-      & > .date {
->>>>>>> 54bd7b3a6 (Show bookmark icon for saved messages)
+      & > .date,
+      & > .edited {
         color: white;
       }
     }