Implement equality checks for Targets. Don't consider equal targets as conflicting...

[enjoyable.git] / ConfigsController.m

diff --git a/ConfigsController.m b/ConfigsController.m
index 0c32b8b..fb50bc3 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -200,7 +200,8 @@
                           BOOL conflict;
                           Config *mergeInto = self[cfg.name];
                           for (id key in cfg.entries) {
                           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;
                               }
                                   conflict = YES;
                                   break;
                               }