From 1fb81ebb06220f41de4942fd89282cd836618131 Mon Sep 17 00:00:00 2001
From: Simeon Wallrath <forgejo@waldo.works>
Date: Tue, 28 Nov 2023 11:05:32 +0100
Subject: [PATCH] Fixed Merge issue

---
 .../Content/VRE/Core/Character/BP_Teleport_Controller.uasset  | 4 ++--
 .../Content/VRE/ExampleMap/MotionControllerMap.umap           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Teleport_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Teleport_Controller.uasset
index 8875347..15fa50d 100644
--- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Teleport_Controller.uasset
+++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Teleport_Controller.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edbc4a615353c826f68a73058c1506c0d573bc96ea564d2d1890603fafb7f677
-size 299
+oid sha256:17056111eb6e1656e97883bf4aadbf3acbf0a4ecf8cc0721702f36edfe988589
+size 282
diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
index 1d0864f..f34c223 100644
--- a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
+++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a8d1626423e0f5edd9eea54375bd17df9dffb4da0d019ed121da272b1f35d30
-size 297
+oid sha256:ebd96ac6bcac434ea40c964a88b19bc0d762fbde1897c8b893a8afb891eb3f7b
+size 281