Merge custom data only when necessary (#3475)

2019-09-16 14:01:13 -04:00
parent c99b656279
commit c19703c39f
3 changed files with 33 additions and 12 deletions
--- a/tests/TestMerge.h
+++ b/tests/TestMerge.h
@@ -59,7 +59,7 @@ private slots:
    void testMergeCustomIcons();
    void testMergeDuplicateCustomIcons();
    void testMetadata();
-    void testCustomdata();
+    void testCustomData();
    void testDeletedEntry();
    void testDeletedGroup();
    void testDeletedRevertedEntry();