From 24709062aaaef60c659db7633d5f8d29efaf454b Mon Sep 17 00:00:00 2001
From: Gorlum <gorlum@supernova.ws>
Date: Sat, 27 Jul 2019 12:02:53 +0300
Subject: [PATCH] GIT-misc-44d4: Fixed merge conflicts

---
 includes/constants/constants.php | 2 +-
 includes/update.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/constants/constants.php b/includes/constants/constants.php
index 59119f68e..45ad10cbd 100644
--- a/includes/constants/constants.php
+++ b/includes/constants/constants.php
@@ -11,7 +11,7 @@
 define('DB_VERSION_MIN', '40'); // Minimal supported version of DB
 define('DB_VERSION', '44');
 define('SN_RELEASE', '44');
-define('SN_VERSION', '44d3');
+define('SN_VERSION', '44d4');
 define('SN_RELEASE_STABLE', '44d0'); // Latest stable release
 
 define('SN_TIME_NOW', intval(SN_TIME_MICRO));
diff --git a/includes/update.php b/includes/update.php
index f71828b05..6c33cfd94 100644
--- a/includes/update.php
+++ b/includes/update.php
@@ -569,7 +569,7 @@
 //    $updater->updPatchApply(8, function() use ($updater) {
 //    }, PATCH_PRE_CHECK);
 
-    $new_version = 44;
+    $updater->new_version = 44;
     $updater->upd_do_query('COMMIT;', true);
 }