From fddbdafb99cf739b435220a7a4e259a27040f03a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 10 Sep 2024 19:03:56 +0100 Subject: [PATCH] Fixed conflict Signed-off-by: snipe --- config/version.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/config/version.php b/config/version.php index 5ad2f34943..a45c5531b6 100644 --- a/config/version.php +++ b/config/version.php @@ -4,13 +4,7 @@ return array ( 'full_app_version' => 'v7.0.12 - build 15249-g713bb104e', 'build_version' => '15249', 'prerelease_version' => '', -<<<<<<< HEAD - 'hash_version' => 'g46ed07642', - 'full_hash' => 'v7.0.11-133-g46ed07642', - 'branch' => 'master', -======= 'hash_version' => 'g713bb104e', 'full_hash' => 'v7.0.12-338-g713bb104e', - 'branch' => 'develop', ->>>>>>> origin/develop + 'branch' => 'master', ); \ No newline at end of file