From fc4f4827c15fb96add42693b8e5948f5925336a2 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 21 May 2022 23:54:59 +0300
Subject: [PATCH] pump version to 1.83.0

---
 versioning.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/versioning.js b/versioning.js
index ea45eff7..8e3104d5 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,11 @@
 "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;