|
|
@@ -1324,7 +1324,11 @@
|
|
|
},
|
|
|
"node_modules/@wangeditor/editor-for-vue": {
|
|
|
"version": "5.1.12",
|
|
|
+<<<<<<< HEAD
|
|
|
"resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
|
|
|
+=======
|
|
|
+ "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
|
|
|
+>>>>>>> da6973fcdd4fa52a191cc4f853b58f24845a583c
|
|
|
"integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==",
|
|
|
"peerDependencies": {
|
|
|
"@wangeditor/editor": ">=5.1.0",
|
|
|
@@ -6813,6 +6817,7 @@
|
|
|
"node": ">= 0.8.0"
|
|
|
}
|
|
|
},
|
|
|
+<<<<<<< HEAD
|
|
|
"node_modules/prettier": {
|
|
|
"version": "2.8.7",
|
|
|
"resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.7.tgz",
|
|
|
@@ -6824,6 +6829,13 @@
|
|
|
"engines": {
|
|
|
"node": ">=10.13.0"
|
|
|
}
|
|
|
+=======
|
|
|
+ "@wangeditor/editor-for-vue": {
|
|
|
+ "version": "5.1.12",
|
|
|
+ "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
|
|
|
+ "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==",
|
|
|
+ "requires": {}
|
|
|
+>>>>>>> da6973fcdd4fa52a191cc4f853b58f24845a583c
|
|
|
},
|
|
|
"node_modules/prettier-linter-helpers": {
|
|
|
"version": "1.0.0",
|
