From e355ac54b8600ea850f7f9f11af374c84ba144a0 Mon Sep 17 00:00:00 2001
From: louib <code@louib.net>
Date: Fri, 15 Dec 2023 22:07:56 -0500
Subject: [PATCH] refactor: remove unused merge function

This function in unused since we removed the all the unused merge modes
in f7fd3881e3b1c8872068d600d56b76ae95abfe7e
---
 share/translations/keepassxc_en.ts | 4 ----
 src/core/Merger.cpp                | 7 -------
 src/core/Merger.h                  | 1 -
 3 files changed, 12 deletions(-)

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 050b50ed5f..909bb39dba 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -5611,10 +5611,6 @@ We recommend you use the AppImage available on our downloads page.</source>
         <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>older entry merged from database &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"></translation>
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index 3f9ae4c0c4..4cfe4b5e4e 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -158,13 +158,6 @@ Merger::resolveGroupConflict(const MergeContext& context, const Group* sourceChi
     return changes;
 }
 
-bool Merger::markOlderEntry(Entry* entry)
-{
-    entry->attributes()->set(
-        "merged", tr("older entry merged from database \"%1\"").arg(entry->group()->database()->metadata()->name()));
-    return true;
-}
-
 void Merger::moveEntry(Entry* entry, Group* targetGroup)
 {
     Q_ASSERT(entry);
diff --git a/src/core/Merger.h b/src/core/Merger.h
index 294eb82aca..d2d1da4fdb 100644
--- a/src/core/Merger.h
+++ b/src/core/Merger.h
@@ -49,7 +49,6 @@ class Merger : public QObject
     ChangeList mergeGroup(const MergeContext& context);
     ChangeList mergeDeletions(const MergeContext& context);
     ChangeList mergeMetadata(const MergeContext& context);
-    bool markOlderEntry(Entry* entry);
     bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod);
     void moveEntry(Entry* entry, Group* targetGroup);
     void moveGroup(Group* group, Group* targetGroup);