fixed merge conflict

(hopefully!)

Pathfinding Visualizer/Assets/Scenes/MainScene.unity

@@ -123,9 +123,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
-<<<<<<< Updated upstream
---- !u!1 &45376067
-=======
 --- !u!1 &120990015
 GameObject:
   m_ObjectHideFlags: 0
@@ -195,7 +192,6 @@ MonoBehaviour:
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
 --- !u!1 &480666364
->>>>>>> Stashed changes
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,11 +215,6 @@ MeshFilter:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-<<<<<<< Updated upstream
-  m_GameObject: {fileID: 45376067}
-  m_Mesh: {fileID: 0}
---- !u!114 &45376069
-=======
   m_GameObject: {fileID: 480666364}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
@@ -234,7 +225,6 @@ MeshFilter:
   m_Father: {fileID: 1304633099}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &480666366
->>>>>>> Stashed changes
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -539,11 +529,5 @@ Transform:
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-<<<<<<< Updated upstream
-  - {fileID: 519420032}
-  - {fileID: 144141395}
-  - {fileID: 45376070}
-=======
   - {fileID: 1304633099}
   - {fileID: 802346181}
->>>>>>> Stashed changes