remove merge leftovers
This commit is contained in:
parent
1f8e88fa3c
commit
7d9cdf86a3
|
@ -14,10 +14,5 @@ Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
|
|||
Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
|
||||
Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,target=android-10
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> upstream/master
|
||||
Market Version:1.0
|
||||
Market Version Code:9
|
||||
|
|
Loading…
Reference in a new issue