lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed conflict

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-09-10 19:03:56 +01:00
parent a5dbece1a9
commit fddbdafb99
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -4,13 +4,7 @@ return array (
'full_app_version' => 'v7.0.12 - build 15249-g713bb104e', 'full_app_version' => 'v7.0.12 - build 15249-g713bb104e',
'build_version' => '15249', 'build_version' => '15249',
'prerelease_version' => '', 'prerelease_version' => '',
<<<<<<< HEAD
'hash_version' => 'g46ed07642',
'full_hash' => 'v7.0.11-133-g46ed07642',
'branch' => 'master',
=======
'hash_version' => 'g713bb104e', 'hash_version' => 'g713bb104e',
'full_hash' => 'v7.0.12-338-g713bb104e', 'full_hash' => 'v7.0.12-338-g713bb104e',
'branch' => 'develop', 'branch' => 'master',
>>>>>>> origin/develop
); );