Remove additional merge marks from files

Author: rlazo

firebase-dataconnect/firebase-dataconnect.gradle.kts

@@ -96,15 +96,10 @@ dependencies {
 
   implementation("com.google.firebase:firebase-annotations:16.2.0")
   implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
-<<<<<<< Updated upstream
-  implementation("com.google.firebase:firebase-auth-interop:20.0.0")
-  implementation("com.google.firebase:firebase-components:18.0.0")
-=======
   implementation("com.google.firebase:firebase-auth-interop:20.0.0") {
     exclude(group="com.google.firebase", module="firebase-common-ktx")
   }
   implementation("com.google.firebase:firebase-components:19.0.0")
->>>>>>> Stashed changes
 
   compileOnly(libs.javax.annotation.jsr250)
   compileOnly(libs.kotlinx.datetime)

firebase-perf/firebase-perf.gradle

@@ -113,17 +113,10 @@ dependencies {
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
     api project(":protolite-well-known-types")
     implementation libs.okhttp
-<<<<<<< Updated upstream
-    api("com.google.firebase:firebase-common:21.0.0")
-    api("com.google.firebase:firebase-components:18.0.0")
-    api("com.google.firebase:firebase-config:21.5.0")
-    api("com.google.firebase:firebase-installations:17.2.0")
-=======
     api("com.google.firebase:firebase-common:22.0.0")
     api("com.google.firebase:firebase-components:19.0.0")
     api(project(":firebase-config"))
     api(project(":firebase-installations"))
->>>>>>> Stashed changes
     api("com.google.firebase:firebase-sessions:2.0.7") {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-common-ktx'

firebase-storage/firebase-storage.gradle

@@ -86,13 +86,8 @@ dependencies {
     javadocClasspath libs.autovalue.annotations
     javadocClasspath libs.findbugs.jsr305
 
-<<<<<<< Updated upstream
-    api("com.google.firebase:firebase-annotations:16.2.0")
-    api("com.google.firebase:firebase-appcheck:17.1.0") {
-=======
     api("com.google.firebase:firebase-annotations:17.0.0")
     api(project(":appcheck:firebase-appcheck")) {
->>>>>>> Stashed changes
         exclude group: "com.google.firebase", module: "firebase-common"
         exclude group: "com.google.firebase", module: "firebase-components"
         exclude group: "com.google.firebase", module: "firebase-annotations"