Fix duplicate entries when merges don't conflict.

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index 772b14ab6baab7b27ea2989f978bdd7a0ec8d88d..4a9c3fffaba6ccc82c42fde5cf827bbd10a65b00 100644 (file)
--- a/Classes/NJMappingsController.m
+++ b/Classes/NJMappingsController.m
@@ -247,6 +247,10 @@
                                      didEndSelector:@selector(mappingConflictDidResolve:returnCode:contextInfo:)
                                         contextInfo:(void *)CFBridgingRetain(@{ @"old mapping": mergeInto,
                                                                                 @"new mapping": mapping })];
+        } else if (mergeInto) {
+            [mergeInto mergeEntriesFrom:mapping];
+            [self activateMapping:mergeInto];
+            [self mappingsChanged];
         } else {
             [_mappings addObject:mapping];
             [self activateMapping:mapping];

diff --git a/Info.plist b/Info.plist
index 2aada49210af30e3fdf4c7c6fdd6cb1839770446..04d4b4b396751ef47abdd00b9817b648eea6c347 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>226</string>
+       <string>228</string>
        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>