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/capabilities/EditorCapability.js
+++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js
@@ -49,7 +49,7 @@ define(
         * currently being edited.
         * @returns boolean
         */
-        EditorCapability.prototype.isEditing = function () {
+        EditorCapability.prototype.inEditContext = function () {
            return isEditing(this.domainObject);
        };