From ce9bdbeb1f7a7f01cac479dadf3a9bffe88afc77 Mon Sep 17 00:00:00 2001
From: rtak <rtak@e-sites.nl>
Date: Thu, 2 Jul 2020 09:57:51 +0200
Subject: [PATCH] reverted faulthy changes

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 2bab3d0..24433a4 100755
--- 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": {