fix build gradle

RazerMS · Jul 24, 2018 · c4af115 · c4af115
1 parent 5e12dd1
commit c4af115
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -13,11 +13,6 @@ android {
 }
 
 dependencies {
-<<<<<<< HEAD
-    compile 'com.facebook.react:react-native:+'
-    compile 'com.molpay:molpay-mobile-xdk-android:3.20.0'
-=======
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.molpay:molpay-mobile-xdk-android:3.21.0'
->>>>>>> 489a072... update android gradle
 }