浏览代码

Merge branch 'msg-sever' into dev

haojianlong 5 年之前
父节点
当前提交
546052f1e8
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      package.json

+ 4 - 0
package.json

@@ -28,7 +28,11 @@
         "@saga-web/base": "2.1.9",
         "@saga-web/base": "2.1.9",
         "@saga-web/draw": "2.1.61",
         "@saga-web/draw": "2.1.61",
         "@saga-web/graphy": "2.1.34",
         "@saga-web/graphy": "2.1.34",
+<<<<<<< HEAD
         "@saga-web/cad-engine": "2.0.426"
         "@saga-web/cad-engine": "2.0.426"
+=======
+        "@saga-web/cad-engine": "2.0.432"
+>>>>>>> msg-sever
     },
     },
     "devDependencies": {
     "devDependencies": {
         "ajv": "^6.9.1",
         "ajv": "^6.9.1",