fix build gradle

LeowWH · LeowWH · commit c4af1156bd14 · 2018-07-24T12:24:28.000+09:00
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
 }

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,6 @@ android {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`-<<<<<<< HEAD`
`17`		`- compile 'com.facebook.react:react-native:+'`
`18`		`- compile 'com.molpay:molpay-mobile-xdk-android:3.20.0'`
`19`		`-=======`
`20`	`16`	`implementation 'com.facebook.react:react-native:+'`
`21`	`17`	`implementation 'com.molpay:molpay-mobile-xdk-android:3.21.0'`
`22`		`->>>>>>> 489a072... update android gradle`
`23`	`18`	`}`