From 22cc2739812a78f97dec34cd37c089e15c08c0b7 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 30 May 2022 00:37:03 +0300
Subject: [PATCH] version info and hash update

---
 index.html            | 12 ++++++------
 modules/ui/editors.js |  2 +-
 versioning.js         |  4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 138148d5..4da56d9c 100644
--- a/index.html
+++ b/index.html
@@ -7914,14 +7914,14 @@
     <script defer src="modules/ui/relief-editor.js"></script>
     <script defer src="modules/ui/burg-editor.js"></script>
     <script defer src="modules/ui/units-editor.js"></script>
-    <script defer src="modules/ui/notes-editor.js"></script>
+    <script defer src="modules/ui/notes-editor.js?v=29052022"></script>
     <script defer src="modules/ui/diplomacy-editor.js"></script>
     <script defer src="modules/ui/zones-editor.js?v=18052022"></script>
-    <script defer src="modules/ui/burgs-overview.js"></script>
-    <script defer src="modules/ui/rivers-overview.js"></script>
-    <script defer src="modules/ui/military-overview.js"></script>
-    <script defer src="modules/ui/regiments-overview.js"></script>
-    <script defer src="modules/ui/markers-overview.js"></script>
+    <script defer src="modules/ui/burgs-overview.js?v=29052022"></script>
+    <script defer src="modules/ui/rivers-overview.js?v=29052022"></script>
+    <script defer src="modules/ui/military-overview.js?v=29052022"></script>
+    <script defer src="modules/ui/regiments-overview.js?v=29052022"></script>
+    <script defer src="modules/ui/markers-overview.js?v=29052022"></script>
     <script defer src="modules/ui/regiment-editor.js"></script>
     <script defer src="modules/ui/battle-screen.js"></script>
     <script defer src="modules/ui/resource-editor.js"></script>
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 88af3f20..8b026e8c 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -1200,6 +1200,6 @@ async function editStates() {
 
 async function editCultures() {
   if (customization) return;
-  const CulturesEditor = await import("../dynamic/editors/cultures-editor.js");
+  const CulturesEditor = await import("../dynamic/editors/cultures-editor.js?v=29052022");
   CulturesEditor.open();
 }
diff --git a/versioning.js b/versioning.js
index 8e3104d5..ea45eff7 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,11 +1,7 @@
 "use strict";
 
-<<<<<<< HEAD
 // version and caching control
 const version = "1.87.15"; // generator version, update each time
-=======
-const version = "1.83.0"; // generator version, update each time
->>>>>>> 1d405891 (pump version to 1.83.0)
 
 {
   document.title += " v" + version;