Resolved merge conflicts

2016-05-12 16:03:19 -07:00
parent e5ef7c0c22
commit bd686790dc
11 changed files with 53 additions and 91 deletions
--- a/platform/commonUI/edit/src/services/DirtyModelCache.js
+++ b/platform/commonUI/edit/src/services/DirtyModelCache.js
@@ -32,7 +32,7 @@ define(
        };

        DirtyModelCache.prototype.isDirty = function (domainObject) {
-            return !!this.get(domainObject.getId());
+            return !!this.cache[domainObject.getId()];
        };

        DirtyModelCache.prototype.markDirty = function (domainObject) {