Исправил остатки слияния веток
Some checks failed
Projman build the packages / Projman-Build (push) Has been cancelled
Some checks failed
Projman build the packages / Projman-Build (push) Has been cancelled
This commit is contained in:
parent
397117e770
commit
d17aef0878
|
@ -10,11 +10,7 @@ exec wish "$0" -- "$@"
|
|||
######################################################
|
||||
# Version: 2.0.0
|
||||
# Release: alpha
|
||||
<<<<<<< HEAD
|
||||
# Build: 17052024103352
|
||||
=======
|
||||
# Build: 30072023112719
|
||||
>>>>>>> 72abc2b84fd6c3356483d080873246f025340b20
|
||||
# Build: 17052024104440
|
||||
######################################################
|
||||
|
||||
# определим текущую версию, релиз и т.д.
|
||||
|
|
Loading…
Reference in New Issue
Block a user