From 487106cf845b86e2549cbd3418eb445541ea15f0 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Tue, 16 Nov 2021 20:33:39 +0200
Subject: [PATCH] Update

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

diff --git a/package.json b/package.json
index 6f3824ac..7c8124cb 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "name": "@eeacms/industry-frontend",
   "description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
   "license": "MIT",
-<<<<<<< HEAD
   "version": "3.3.0",
-=======
-  "version": "3.2.3",
->>>>>>> origin/master
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
   "homepage": "https://github.com/eea/industry-frontend",