diff --git a/Assets/XR/Settings/OpenXRPackageSettings.asset b/Assets/XR/Settings/OpenXRPackageSettings.asset index 1582035..84bd467 100644 --- a/Assets/XR/Settings/OpenXRPackageSettings.asset +++ b/Assets/XR/Settings/OpenXRPackageSettings.asset @@ -1182,11 +1182,15 @@ MonoBehaviour: - {fileID: -7499073031166464939} - {fileID: 7666556398442971420} <<<<<<< Updated upstream +<<<<<<< Updated upstream <<<<<<< Updated upstream - {fileID: -7343570946846779558} ======= - {fileID: -142859899272520151} >>>>>>> Stashed changes +======= + - {fileID: -142859899272520151} +>>>>>>> Stashed changes ======= - {fileID: -142859899272520151} >>>>>>> Stashed changes