Update

CHANGELOG.md

@@ -9,6 +9,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Release @eeacms/volto-industry-theme@1.1.4 [`ee65ad5`](https://github.com/eea/industry-frontend/commit/ee65ad5dd26a5366e729657b7455e97f89ec29d3)
 - Update Dockerfile [`160af5d`](https://github.com/eea/industry-frontend/commit/160af5d7833b60c0d8c220d8b5b0066286ea989f)
 - Rename jsconfig.json.tpl to jsconfig.json.prod [`779535c`](https://github.com/eea/industry-frontend/commit/779535cdce022bf8b97c503228dbc1047d01d214)
+#### [3.2.3](https://github.com/eea/industry-frontend/compare/3.2.2...3.2.3)
+
+- Update [`aa291d6`](https://github.com/eea/industry-frontend/commit/aa291d62adb0cbdc0281f37ca99883576cee4ea4)
 
 #### [3.2.2](https://github.com/eea/industry-frontend/compare/3.2.1...3.2.2)
 

jsconfig.json

@@ -1,6 +1,6 @@
 {
-  "compilerOptions": {
-    "paths": {},
-    "baseUrl": "src"
-  }
+    "compilerOptions": {
+        "paths": {},
+        "baseUrl": "src"
+    }
 }

mrs.developer.json

@@ -5,5 +5,12 @@
     "package": "@eeacms/volto-industry-theme",
     "branch": "develop",
     "path": "src"
+  },
+  "volto-datablocks": {
+    "url": "git@github.com:eea/volto-datablocks.git",
+    "https": "https://github.com/eea/volto-datablocks.git",
+    "package": "@eeacms/volto-datablocks",
+    "branch": "develop",
+    "path": "src"
   }
 }

package.json

@@ -2,7 +2,11 @@
   "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",
@@ -39,7 +43,7 @@
     "release-beta": "release-it --preRelease=beta"
   },
   "dependencies": {
-    "@eeacms/volto-eea-kitkat": "4.1.1",
+    "@eeacms/volto-eea-kitkat": "4.1.3",
     "@eeacms/volto-industry-theme": "1.1.4",
     "@plone/volto": "13.15.1"
   },
@@ -51,6 +55,9 @@
     "stylelint-config-prettier": "8.0.1",
     "stylelint-prettier": "1.1.2"
   },
+  "resolutions": {
+    "volto-slate": "4.2.1"
+  },
   "jest": {
     "modulePathIgnorePatterns": [
       "api"