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