From 778825f2d0a939327f8d617351a92a87c78da981 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 16 Apr 2019 09:34:59 +0200
Subject: [PATCH] Matching master version

---
 app/build.gradle | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 065fb234..4c62fa11 100644
--- 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"
     }