fix jetchat conflicts

souvlakias · souvlakias · commit 5f700b45500b · 2025-10-17T13:09:19.000+03:00
diff --git a/Jetchat/package.mill b/Jetchat/package.mill
@@ -94,7 +94,10 @@ object app extends BaseAndroidModule, AndroidR8AppModule {
       mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",
       mvn"androidx.compose.ui:ui-test",
       mvn"androidx.compose.ui:ui-test-junit4",
-      mvn"androidx.collection:collection-ktx:1.5.0"
+      mvn"androidx.collection:collection-ktx:1.5.0",
+
+      // Resolve conflicts
+      mvn"androidx.savedstate:savedstate-ktx:1.3.0"
     )
 
   }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,10 @@ object app extends BaseAndroidModule, AndroidR8AppModule {`
`94`	`94`	`mvn"org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2",`
`95`	`95`	`mvn"androidx.compose.ui:ui-test",`
`96`	`96`	`mvn"androidx.compose.ui:ui-test-junit4",`
`97`		`- mvn"androidx.collection:collection-ktx:1.5.0"`
	`97`	`+ mvn"androidx.collection:collection-ktx:1.5.0",`
	`98`	`+`
	`99`	`+ // Resolve conflicts`
	`100`	`+ mvn"androidx.savedstate:savedstate-ktx:1.3.0"`
`98`	`101`	`)`
`99`	`102`
`100`	`103`	`}`