Resolved merge conflicts

2016-05-12 16:09:53 -07:00
parent 4b786d3536
commit d00e13e4ee
8 changed files with 10 additions and 10 deletions
--- a/platform/commonUI/edit/src/policies/EditActionPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditActionPolicy.js
@@ -72,9 +72,8 @@ define(
         */
        function isEditing(context) {
            var domainObject = (context || {}).domainObject;
-            return domainObject &&
-                domainObject.hasCapability('status') &&
-                domainObject.getCapability('status').get('editing');
+            return domainObject
+                && domainObject.getCapability('status').get('editing');
        }

        EditActionPolicy.prototype.allow = function (action, context) {