解决冲突

package.json

@@ -7,22 +7,11 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "ajv": "^8.0.0",
-    "bufferutil": "^4.0.8",
-    "core-js": "^3.8.3",
-    "element-ui": "^2.15.14",
-    "encoding": "^0.1.13",
-    "request": "^2.88.2",
-    "typescript": "^5.3.2",
-    "utf-8-validate": "^6.0.3",
-=======
     "@onlyoffice/document-editor-vue": "^1.3.0",
     "axios": "^1.6.2",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.14",
     "jquery": "^3.7.1",
->>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
     "vue": "^2.6.14",
     "vue-cli": "^2.9.6",
     "vue-router": "^3.5.1",

public/drawio/js/diagramly/sidebar/Sidebar-ArchiMate3.js

@@ -146,12 +146,8 @@
 					w * 150, h * 90, '', 'Representation', null, null, this.getTagsForStencil(gn, '', dt + 'representation').join(' '))
 		];
 			
-<<<<<<< HEAD
-		this.addPalette('archimate3Business', 'Archimate 3.0 / Business', false, mxUtils.bind(this, function(content)
-=======
 		// this.addPalette('archimate3Business', 'archimate 3.0 / Business', true, mxUtils.bind(this, function(content)
 		this.addPalette('archimate3Business', '架构 / 业务', false, mxUtils.bind(this, function(content)
->>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
 				{
 					for (var i = 0; i < fns.length; i++)
 					{