fix: merge

This commit is contained in:
rorya.lyj 2020-08-14 14:11:05 +08:00
parent a088bb1ec0
commit ac55847b3f

View File

@ -1,8 +1,4 @@
import LowCodeRenderer from '@ali/lowcode-react-renderer';
<<<<<<< HEAD
=======
// import { isObject } from 'lodash';
>>>>>>> release/0.9.3
import { ReactInstance, Fragment, Component, createElement } from 'react';
import { observer } from '@recore/obx-react';
import { SimulatorRendererContainer, DocumentInstance } from './renderer';