Merge pull request #61 from obiwankenoobi/fix-v-conflict

tschoffelen · web-flow · commit 4f47d80ff698 · 2019-04-21T16:58:03.000+02:00
fixing conflict created when trying to build because of different RN v…
diff --git a/packages/react-native-version-check/android/build.gradle b/packages/react-native-version-check/android/build.gradle
@@ -25,6 +25,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:0.20.+'
+    implementation 'com.facebook.react:react-native:+'
 }
   

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ android {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`dependencies {`
`28`		`- implementation 'com.facebook.react:react-native:0.20.+'`
	`28`	`+ implementation 'com.facebook.react:react-native:+'`
`29`	`29`	`}`
`30`	`30`