haojianlong %!s(int64=5) %!d(string=hai) anos
pai
achega
cf26ab5c69
Modificáronse 1 ficheiros con 0 adicións e 4 borrados
  1. 0 4
      package.json

+ 0 - 4
package.json

@@ -28,11 +28,7 @@
         "@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",