mirror of
https://github.com/nasa/openmct.git
synced 2025-06-17 06:38:17 +00:00
Resolved merge conflicts
This commit is contained in:
@ -49,7 +49,7 @@ define(
|
||||
* currently being edited.
|
||||
* @returns boolean
|
||||
*/
|
||||
EditorCapability.prototype.isEditing = function () {
|
||||
EditorCapability.prototype.inEditContext = function () {
|
||||
return isEditing(this.domainObject);
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user