il y a 4 ans · 7a66396a22
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -30,14 +30,9 @@
 
				         "eslint-plugin-vue": "^7.0.0-0",
			
 
				         "less": "^4.0.0",
			
 
				         "less-loader": "^7.2.1",
			
 
				-<<<<<<< HEAD
			
 
				-        "node-sass": "^5.0.0",
			
 
				-        "sass-loader": "^11.0.1"
			
 
				-=======
			
 
				         "node-sass": "^4.12.0",
			
 
				         "sass-loader": "^8.0.2",
			
 
				         "sass-resources-loader": "^2.2.1"
			
 
				->>>>>>> cf1b240d4d7dca2b25f0e2abe7cb99ef226b9303
			
 
				     },
			
 
				     "eslintConfig": {
			
 
				         "root": true,