diff options
| author | Simon O'Shea <osheas1@wit.edu> | 2023-08-03 14:37:02 -0400 |
|---|---|---|
| committer | Simon O'Shea <osheas1@wit.edu> | 2023-08-03 14:37:02 -0400 |
| commit | d97f09ac3090cfd4fbf27d8e31f1f344628b9866 (patch) | |
| tree | 433e25bdcb00d5b1fd871a793ffb637f4f6e1d99 /Pathfinding Visualizer | |
| parent | 2f408d60694e13476b3ca4af3ccf1f03e4e178d4 (diff) | |
fixed merge conflict
(hopefully!)
Diffstat (limited to 'Pathfinding Visualizer')
| -rw-r--r-- | Pathfinding Visualizer/Assets/Scenes/MainScene.unity | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/Pathfinding Visualizer/Assets/Scenes/MainScene.unity b/Pathfinding Visualizer/Assets/Scenes/MainScene.unity index dc16a9b..5e4a83c 100644 --- a/Pathfinding Visualizer/Assets/Scenes/MainScene.unity +++ b/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 |