fixed merge conflicts

ubisoft · Aug 31, 2021 · c947cb6 · c947cb6
1 parent 119d621
commit c947cb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset
@@ -169,17 +169,17 @@ MonoBehaviour:
   m_Name: Standalone
   m_EditorClassIdentifier: 
   features:
+  - {fileID: -9129517320456845295}
   - {fileID: -8025771264000862841}
+  - {fileID: 3410148292709481512}
   - {fileID: -162898915204442217}
   - {fileID: -8569171735363903502}
   - {fileID: -2138766635108399113}
   - {fileID: 8800417690740139082}
   - {fileID: 6032642224979219278}
-  - {fileID: -9129517320456845295}
-  - {fileID: -7257466664129935623}
   - {fileID: 5816620396119577684}
-  - {fileID: 3410148292709481512}
   - {fileID: -6177542524004369683}
+  - {fileID: -7257466664129935623}
   m_renderMode: 1
   m_depthSubmissionMode: 0
 --- !u!114 &3410148292709481512

diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset
@@ -16,16 +16,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-<<<<<<< HEAD
-<<<<<<< HEAD
   - {fileID: 11400000, guid: c4994592528d043469e714d03a1630e9, type: 2}
-=======
-  - {fileID: 11400000, guid: 757a3e827c578ce47b2ae919cc103f56, type: 2}
-=======
-  - {fileID: 11400000, guid: c4994592528d043469e714d03a1630e9, type: 2}
->>>>>>> a44f9732... pinned pannel
-  - {fileID: 11400000, guid: 6c2b6675404fc8945a7af56b4b42fa88, type: 2}
->>>>>>> 7d5c2f91... First working version of the grass
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0