feat:update

package.json

@@ -18,11 +18,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-<<<<<<< HEAD
-    "@antv/g6": "^5.0.51",
-=======
     "@antv/g6": "^4.8.24",
->>>>>>> bcccf5986756021846ec7ffd1850352eae45f26c
     "@element-plus/icons-vue": "^2.3.1",
     "@kangc/v-md-editor": "^2.3.18",
     "@microsoft/fetch-event-source": "^2.0.1",