Fix mangled merge commit

Carter Hudson · Carter Hudson · commit 2f5645240ac7 · 2021-01-20T13:48:42.000-07:00
diff --git a/samplejava/build.gradle b/samplejava/build.gradle
@@ -37,7 +37,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "io.getstream:stream-chat-android-ui-components:4.5.1"
     implementation 'io.coil-kt:coil:1.1.1'
 
diff --git a/samplekotlin/build.gradle b/samplekotlin/build.gradle
@@ -39,12 +39,7 @@ android {
 }
 
 dependencies {
-<<<<<<< Updated upstream
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "io.getstream:stream-chat-android-ui-components:4.5.1"
-=======
-    implementation "io.getstream:stream-chat-android-ui-components:4.5.0"
->>>>>>> Stashed changes
     implementation 'io.coil-kt:coil:1.1.1'
 
     implementation "androidx.recyclerview:recyclerview:1.1.0"

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ android {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`dependencies {`
`40`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`
`41`	`40`	`implementation "io.getstream:stream-chat-android-ui-components:4.5.1"`
`42`	`41`	`implementation 'io.coil-kt:coil:1.1.1'`
`43`	`42`