From b14acd0b4e710c232628859dc2f44f9baabb2689 Mon Sep 17 00:00:00 2001
From: oogushiyuuga <fda.oogushi.yuuga@gmail.com>
Date: Tue, 30 Jun 2026 09:54:21 +0900
Subject: [PATCH] /

---
 Assets/XR/Settings/OpenXRPackageSettings.asset | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Assets/XR/Settings/OpenXRPackageSettings.asset b/Assets/XR/Settings/OpenXRPackageSettings.asset
index cc7a9fd..1582035 100644
--- a/Assets/XR/Settings/OpenXRPackageSettings.asset
+++ b/Assets/XR/Settings/OpenXRPackageSettings.asset
@@ -1181,8 +1181,12 @@ MonoBehaviour:
   - {fileID: 348827886137839178}
   - {fileID: -7499073031166464939}
   - {fileID: 7666556398442971420}
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
   - {fileID: -7343570946846779558}
+=======
+  - {fileID: -142859899272520151}
+>>>>>>> Stashed changes
 =======
   - {fileID: -142859899272520151}
 >>>>>>> Stashed changes