remove merge changes

nextmcloud · Aug 13, 2024 · bb1553f · bb1553f
1 parent 7ed5ff5
commit bb1553f
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 15 deletions.
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
@@ -154,7 +154,7 @@ void User::showDesktopNotification(const Activity &activity)
 
 void User::showDesktopNotification(const ActivityList &activityList)
 {
-    const auto subject = tr("%1 notifications").arg(activityList.count());
+    const auto subject = QStringLiteral("%1 notifications").arg(activityList.count());
     const auto notificationId = -static_cast<int>(qHash(subject));
 
     if (!canShowNotification(notificationId)) {

diff --git a/theme/NMCIcons/configuration1.png b/theme/NMCIcons/configuration1.png
diff --git a/theme/NMCIcons/configuration2.png b/theme/NMCIcons/configuration2.png
diff --git a/theme/NMCIcons/configuration3.png b/theme/NMCIcons/configuration3.png
diff --git a/theme/NMCIcons/navigation-left.svg b/theme/NMCIcons/navigation-left.svg
diff --git a/theme/NMCIcons/navigation-right.svg b/theme/NMCIcons/navigation-right.svg