github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-19 05:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
rorya.lyj 2020-08-14 14:11:05 +08:00
parent a088bb1ec0
commit ac55847b3f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/react-simulator-renderer/src/renderer-view.tsx
View File

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