Fixed merge Conflict
This commit is contained in:
parent
2253406c50
commit
bb9202b69f
4 changed files with 7 additions and 7 deletions
BIN
VIRTUOS_ExpansionPluginTests/Content/MainMenu/BP_MainMenu.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/MainMenu/BP_MainMenu.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/MainMenu/WB_MainMenu.uasset
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/MainMenu/WB_MainMenu.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap.umap
(Stored with Git LFS)
Binary file not shown.
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap
(Stored with Git LFS)
BIN
VIRTUOS_ExpansionPluginTests/Content/VRE/ExampleMap/MotionControllerMap1_BlockOut.umap
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in a new issue