From 79c47e3ce9772993f80b08e8ed8dfcef7061d13b Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Wed, 11 Mar 2020 19:09:09 -0300
Subject: [PATCH] Fix bad merge

---
 android/app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 57fdd1278..d30b05874 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -130,6 +130,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60"
         versionCode 276
         versionName "1.29.0"
         multiDexEnabled = true