1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/Merger.h b/src/core/Merger.h
index 03a47a27f..712f4fde3 100644
--- a/src/core/Merger.h
+++ b/src/core/Merger.h
@@ -33,7 +33,7 @@ public:
     Merger(const Group* sourceGroup, Group* targetGroup);
     void setForcedMergeMode(Group::MergeMode mode);
     void resetForcedMergeMode();
-    bool merge();
+    QStringList merge();
 
 private:
     typedef QString Change;