mirror of
https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git
synced 2025-01-24 16:24:51 -05:00
f71f90aac0
# Conflicts: # Assets/Samples/XR Hands.meta # Assets/Samples/XR Interaction Toolkit/2.4.3.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Tunneling Vignette/TunnelingVignette.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta # Packages/manifest.json # Packages/packages-lock.json
13 lines
509 B
Plaintext
13 lines
509 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta
|
|
guid: 53c16fb5d5c516b40a1f6a8fc34132f3
|
|
========
|
|
guid: 0a35b7e20f75a8540a2c14b9555078cb
|
|
>>>>>>>> feature/MAVRIC-2127_Thumbwheel:Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
mainObjectFileID: 0
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|