Merge remote-tracking branch 'origin/session-pref' into session-pref

# Conflicts: # simbot-extensions/simbot-extension-continuous-session/src/commonTest/kotlin/ContinuousSessionTest.kt
simple-robot · Feb 15, 2024 · 0382fbf · 0382fbf
2 parents 613b688 + 0c053dc
commit 0382fbf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...nsions/simbot-extension-continuous-session/src/commonTest/kotlin/ContinuousSessionTest.kt b/...nsions/simbot-extension-continuous-session/src/commonTest/kotlin/ContinuousSessionTest.kt
@@ -23,8 +23,8 @@
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.test.runTest
-import love.forte.simbot.common.coroutines.IOOrDefault
-import love.forte.simbot.extension.continuous.session.*
+import kotlinx.coroutines.withTimeoutOrNull
+import love.forte.simbot.extension.continuous.session.ContinuousSessionContext
 import love.forte.simbot.extension.continuous.session.ContinuousSessionContext.ConflictStrategy.EXISTING
 import kotlin.test.*
 import kotlin.time.Duration.Companion.milliseconds