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