test

2026-06-30 09:53:25 +09:00
parent ad992a93ca
commit ad04077906
4 changed files with 2241 additions and 1 deletions
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d17d1b1f689c545af81afc49e49a98c1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Settings/OpenXRPackageSettings.asset
+++ b/Assets/XR/Settings/OpenXRPackageSettings.asset
@@ -1181,7 +1181,11 @@ MonoBehaviour:
  - {fileID: 348827886137839178}
  - {fileID: -7499073031166464939}
  - {fileID: 7666556398442971420}
+<<<<<<< Updated upstream
  - {fileID: -7343570946846779558}
+=======
+  - {fileID: -142859899272520151}
+>>>>>>> Stashed changes
  - {fileID: 3985858319333531581}
  - {fileID: -6511185071715886993}
  - {fileID: -4363231183632145407}