From 5692b65efb439fe11243a0fea65113856ad8bdcf Mon Sep 17 00:00:00 2001
From: glughi <giovanni.lughi@gmail.com>
Date: Thu, 26 Sep 2019 14:12:11 +0200
Subject: [PATCH] Bump to rer3d-map 1.12.2

---
 CHANGES.md   | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index a8cb93b24c..c252af5e27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,9 @@
 Change Log
 ==========
 
+### 1.12.2 - 25/09/2019
+* Fixed merge error.
+
 ### 1.12.1 - 25/09/2019
 * Changed repository owner.
 * Updated rer3d-terriajs to 2.2.2
diff --git a/package.json b/package.json
index 8f0a9781d7..d36bbafe42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rer3d-map",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Regione Emilia-Romagna customization of TerriaMap, a catalog-based web geospatial visualisation platform based on TerriaJS and CesiumJS.",
   "license": "Apache-2.0",
   "engines": {