GIT-misc-44d4: Fixed merge conflicts

supernova-ws · Jul 27, 2019 · 2470906 · 2470906
1 parent ac6875c
commit 2470906
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 }