qml/components/settingsPage/SettingsBehavior.qml

@@ -216,6 +216,7 @@ AccordionItem {
                     }
                 }
             }
+
                 TextSwitch {
                     checked: appSettings.notificationSuppressContent && enabled
                     text: qsTr("Hide content in notifications")

src/appsettings.h

@@ -97,12 +97,9 @@ public:
     bool notificationAlwaysShowPreview() const;
     void setNotificationAlwaysShowPreview(bool enable);
 
-<<<<<<< HEAD
     bool goToQuotedMessage() const;
     void setGoToQuotedMessage(bool enable);
 
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
     bool storageOptimizer() const;
     void setStorageOptimizer(bool enable);
 
@@ -142,10 +139,7 @@ signals:
     void notificationSuppressContentChanged();
     void notificationFeedbackChanged();
     void notificationAlwaysShowPreviewChanged();
-<<<<<<< HEAD
     void goToQuotedMessageChanged();
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
     void storageOptimizerChanged();
     void allowInlineBotLocationAccessChanged();
     void remainingInteractionHintsChanged();