Matching master version

7 years ago · 778825f2d0
parent 40a8565361
commit 778825f2d0
1 changed files with 1 additions and 5 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -28,11 +28,7 @@ android {
        applicationId "net.pokeranalytics.android"
        minSdkVersion 23
        targetSdkVersion 28
-<<<<<<< HEAD
-        versionCode 8
-=======
-        versionCode 15
->>>>>>> f5b9190... Fixes more crashes
+        versionCode 16
        versionName "1.0"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }