Test commit

ProjectSettings/EditorBuildSettings.asset

@@ -6,13 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-<<<<<<< HEAD
     path: Assets/Scenes/Room Noah.unity
     guid: 61951a1951b1742eea6dd27420fae56b
-=======
-    path: Assets/Scenes/Room Lisa.unity
-    guid: 9fc0d4010bbf28b4594072e72b8655ab
->>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 49ee9a368d2424ce0a5faa9d0c644242, type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: d4a8a8d4ef2d74adb9267620f3853997, type: 2}

ProjectSettings/ProjectSettings.asset

@@ -138,10 +138,6 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
-<<<<<<< HEAD
-=======
-  - {fileID: 0}
->>>>>>> c08f0d1ab0094c178fc9b3e23d1980a4142d73cf
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -241,7 +237,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@5.0.4
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  useCustomMainManifest: 1
+  useCustomMainManifest: 0
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0