fix
This commit is contained in:
parent
44e083a495
commit
8c2a682a58
1 changed files with 1 additions and 6 deletions
|
@ -1,8 +1,3 @@
|
|||
APPLICATION_ID=org.askartv.tv
|
||||
<<<<<<< HEAD
|
||||
VERSION_NAME=v0.2.8
|
||||
VERSION_CODE=14
|
||||
=======
|
||||
VERSION_NAME=0.2.7a
|
||||
VERSION_NAME=0.2.7
|
||||
VERSION_CODE=13
|
||||
>>>>>>> parent of 8343fab (semantically fix version.txt for automatic bumps)
|
||||
|
|
Loading…
Reference in a new issue