Resolved merge conflicts

This commit is contained in:
Henry
2016-05-12 16:09:53 -07:00
parent 4b786d3536
commit d00e13e4ee
8 changed files with 10 additions and 10 deletions

View File

@ -49,7 +49,7 @@ define(
* currently being edited.
* @returns boolean
*/
EditorCapability.prototype.isEditing = function () {
EditorCapability.prototype.inEditContext = function () {
return isEditing(this.domainObject);
};