From cc2ed44392e38bc236d88863b0357b275901fbba Mon Sep 17 00:00:00 2001
From: kangwei <bingbing.yb@alibaba-inc.com>
Date: Mon, 30 Mar 2020 21:01:19 +0800
Subject: [PATCH] merge

---
 packages/plugin-designer/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json
index c4c312f98..81c9bc471 100644
--- a/packages/plugin-designer/package.json
+++ b/packages/plugin-designer/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@ali/lowcode-plugin-designer",
-<<<<<<< HEAD
   "version": "0.8.3",
-=======
-  "version": "0.8.1",
->>>>>>> df955e1db90ff104cd11160def80113cfd6faccc
   "description": "alibaba lowcode editor designer plugin",
   "files": [
     "es",