Skip to content

Commit 027b5dc

Browse files
committed
Remove merge markers
1 parent 3923c1e commit 027b5dc

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

firebase-config/firebase-config.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,9 @@ dependencies {
7171
exclude(group = "com.google.firebase", module = "firebase-common")
7272
exclude(group = "com.google.firebase", module = "firebase-components")
7373
}
74-
<<<<<<< Updated upstream
75-
api("com.google.firebase:firebase-common:21.0.0")
76-
api("com.google.firebase:firebase-components:18.0.0")
77-
api("com.google.firebase:firebase-installations:17.2.0")
78-
=======
7974
api("com.google.firebase:firebase-common:22.0.0")
8075
api("com.google.firebase:firebase-components:19.0.0")
8176
api(project(":firebase-installations"))
82-
>>>>>>> Stashed changes
8377

8478
// Kotlin & Android
8579
implementation(libs.kotlin.stdlib)

0 commit comments

Comments
 (0)