Solving conflicts

mnbjhu · Aug 23, 2023 · ce4ee27 · ce4ee27
1 parent 96df546
commit ce4ee27
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 5 deletions.
diff --git a/src/commonMain/kotlin/uk/gibby/driver/rpc/Delete.kt b/src/commonMain/kotlin/uk/gibby/driver/rpc/Delete.kt
@@ -3,7 +3,7 @@ package uk.gibby.driver.rpc
 import kotlinx.serialization.json.add
 import kotlinx.serialization.json.buildJsonArray
 import uk.gibby.driver.Surreal
-import uk.gibby.driver.rpc.model.Thing
+import uk.gibby.driver.model.Thing
 
 /**
  * Delete

diff --git a/src/commonMain/kotlin/uk/gibby/driver/rpc/Select.kt b/src/commonMain/kotlin/uk/gibby/driver/rpc/Select.kt
@@ -2,7 +2,7 @@ package uk.gibby.driver.rpc
 
 import kotlinx.serialization.json.*
 import uk.gibby.driver.Surreal
-import uk.gibby.driver.rpc.model.Thing
+import uk.gibby.driver.model.Thing
 import uk.gibby.driver.surrealJson
 
 /**

diff --git a/src/commonTest/kotlin/PatchTest.kt b/src/commonTest/kotlin/PatchTest.kt
@@ -1,7 +1,6 @@
 import kotlinx.coroutines.test.runTest
 import uk.gibby.driver.Surreal
 import uk.gibby.driver.rpc.*
-import uk.gibby.driver.rpc.functions.*
 import utils.cleanDatabase
 import kotlin.test.Test
 import kotlin.test.assertEquals

diff --git a/src/commonTest/kotlin/SelectTest.kt b/src/commonTest/kotlin/SelectTest.kt
@@ -1,7 +1,6 @@
 import kotlinx.coroutines.test.runTest
 import uk.gibby.driver.Surreal
 import uk.gibby.driver.rpc.create
-import uk.gibby.driver.rpc.functions.*
 import uk.gibby.driver.rpc.select
 import uk.gibby.driver.rpc.signin
 import uk.gibby.driver.rpc.use

diff --git a/src/commonTest/kotlin/UpdateTest.kt b/src/commonTest/kotlin/UpdateTest.kt
@@ -1,7 +1,6 @@
 import kotlinx.coroutines.test.runTest
 import uk.gibby.driver.Surreal
 import uk.gibby.driver.rpc.create
-import uk.gibby.driver.rpc.functions.*
 import uk.gibby.driver.rpc.signin
 import uk.gibby.driver.rpc.update
 import uk.gibby.driver.rpc.use