Skip to content
Prev Previous commit
Merge branch 'main' into feature/MF-1550-version-catalog-renaming
# Conflicts:
#	accounts-journey/build.gradle.kts
#	accounts-use-case/build.gradle.kts
#	app-common/build.gradle.kts
#	gradle/libs.versions.toml
#	test-data/build.gradle.kts
  • Loading branch information
WingEraser committed Mar 11, 2025
commit 5bce45d0a4c2de6485ad5ab1f63ae2841f12b5b5
3 changes: 0 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ mockK-android = { module = "io.mockk:mockk-android", version = "" }
## O
orchestrator = { group = "androidx.test", name = "orchestrator", version.ref = "orchestrator" }

## O
orchestrator = { group = "androidx.test", name = "orchestrator", version.ref = "orchestrator" }

## P
poko-gradle-plugin = { group = "dev.drewhamilton.poko", name = "dev.drewhamilton.poko.gradle.plugin", version.ref = "poko" }

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.