mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-10-29 19:31:41 +00:00
Code Issues Projects Releases Wiki Activity

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',
'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',
);