@@ -41,12 +41,8 @@
"vuex": "^3.6.2",
"wangeditor": "^4.7.15",
"wav-encoder": "^1.3.0",
-<<<<<<< HEAD
- "worker-loader": "^2.0.0"
-=======
"worker-loader": "^2.0.0",
"xlsx": "^0.18.5"
->>>>>>> beta
},
"devDependencies": {
"@babel/core": "^7.19.6",
