fix conflicts

Signed-off-by: Petri <petri.hetta@dicode.fi>
nextcloud · Nov 20, 2019 · fc718c8 · fc718c8
1 parent 86df9a2
commit fc718c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ configurations {
 ext {
     jacocoVersion = "0.8.2"
     daggerVersion = "2.25.2"
-    markwonVersion =  "4.1.2"
+    markwonVersion =  "4.2.0"
     prismVersion = "2.0.0"
     androidLibraryVersion = "master-SNAPSHOT"
 
@@ -162,8 +162,8 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20191116
-                versionName "20191116"
+                versionCode 20191120
+                versionName "20191120"
             }
 
             qa {