ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-10 22:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Joel McKinnon 2020-01-23 10:28:59 -08:00
commit 9e4458db10
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/condition/Condition.js
View File

@ -69,7 +69,6 @@ export default class ConditionClass extends EventEmitter {
}
update(newDomainObject) {
console.log('ConditionClass: ', newDomainObject.definition);
this.updateTrigger(newDomainObject.definition.trigger);
this.updateCriteria(newDomainObject.definition.criteria);
this.handleConditionUpdated();

3
src/plugins/condition/components/CurrentOutput.vue
View File

@ -36,6 +36,9 @@ export default {
}
},
mounted() {
},
updated() {
},
methods: {