From ce4ee276e54339cfe4d1bc18583ed89f7681ebd1 Mon Sep 17 00:00:00 2001
From: mnbjhu <james-gibson@ntlworld.com>
Date: Wed, 23 Aug 2023 19:03:51 +0100
Subject: [PATCH] Solving conflicts

---
 src/commonMain/kotlin/uk/gibby/driver/rpc/Delete.kt | 2 +-
 src/commonMain/kotlin/uk/gibby/driver/rpc/Select.kt | 2 +-
 src/commonTest/kotlin/PatchTest.kt                  | 1 -
 src/commonTest/kotlin/SelectTest.kt                 | 1 -
 src/commonTest/kotlin/UpdateTest.kt                 | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/commonMain/kotlin/uk/gibby/driver/rpc/Delete.kt b/src/commonMain/kotlin/uk/gibby/driver/rpc/Delete.kt
index f9e50f1..3d65ad9 100644
--- 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
index 3d7b6f3..7330047 100644
--- 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
index 4acd435..12e56f4 100644
--- 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
index 62bd318..1e7a216 100644
--- 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
index 663cd56..6b5c41f 100644
--- 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