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/capabilities/TransactionalPersistenceCapability.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
@@ -57,7 +57,9 @@ define(
        };

        TransactionalPersistenceCapability.prototype.refresh = function () {
-            var dirtyModelCache = this.dirtyModelCache;
+            var domainObject = this.domainObject,
+                dirtyModelCache = this.dirtyModelCache;
+
            return this.persistenceCapability.refresh().then(function (result) {
                dirtyModelCache.markClean(domainObject);
                return result;