refactor: core merge

This commit is contained in:
cha0s 2019-05-17 04:33:16 -05:00
parent 8360da72cb
commit f1eb174088

View File

@ -1,6 +1,4 @@
import merge from 'lodash.merge';
import {compose, Property} from '@avocado/core';
import {compose, merge, mergeDiff, Property} from '@avocado/core';
import {Vector} from '@avocado/math';
import {Resource} from '@avocado/resource';
import {Synchronized} from '@avocado/state';