X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=fb50bc32c163c5f29114e5a6468583be1402fc91;hp=0c32b8b705f6b87fd186f606655c6cc22c67c128;hb=1700c86669723045bf7abd177ca519f47656e995;hpb=f41f770d67370cbd71002515d81c0842b50cb04b

diff --git a/ConfigsController.m b/ConfigsController.m
index 0c32b8b..fb50bc3 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -200,7 +200,8 @@
                           BOOL conflict;
                           Config *mergeInto = self[cfg.name];
                           for (id key in cfg.entries) {
-                              if (mergeInto.entries[key]) {
+                              if (mergeInto.entries[key]
+                                  && ![mergeInto.entries[key] isEqual:cfg.entries[key]]) {
                                   conflict = YES;
                                   break;
                               }