reverted faulthy changes

e-sites · Jul 2, 2020 · ce9bdbe · ce9bdbe
1 parent 444142e
commit ce9bdbe
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@e-sites/generator-esites-fe",
-<<<<<<< HEAD
   "version": "3.1.2",
-=======
-  "version": "3.1.0",
->>>>>>> be131bfc3568341af490fd15fd3cfa3cc0fdade3
   "description": "Yeoman generator for E-sites frontend",
   "main": "index.js",
   "scripts": {