From 99f46e81945eef27f495fab20acba8f6c7c21dc6 Mon Sep 17 00:00:00 2001
From: Simeon Wallrath <forgejo@waldo.works>
Date: Tue, 28 Nov 2023 11:12:42 +0100
Subject: [PATCH] Hopefully fixed merge issue now

---
 .../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 2d3e8ee..4712568 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:35ec058ee4fbb46178d03ef31b8dbe6fec85efcde2c1c2189a8c1b9f672ae7a9
-size 282
+oid sha256:bae8dbcebfd3643aaf5b5a334f73d9e52b8d46424527df4f3246797fd5733ab0
+size 1955774
diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
index 87aafab..4cf644c 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:df9261296c31c158b6c8fa01f30474732faa9a7d0f77727f8d12b6118499b9f3
-size 281
+oid sha256:e2300e4a212f8cadc03ba0c8888be8246fad1f00299e77d09bbb83a753264b37
+size 863973