diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 74ebc5d..457a504 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -9334,11 +9334,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: -<<<<<<< HEAD - {fileID: 290886138581533559, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} -======= - - {fileID: 1690165032579755590, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} ->>>>>>> bc988ab60ec64c0741074ee2dbaa85f27f64190f m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} insertIndex: -1 @@ -9385,16 +9381,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3c20bad5f6ef76d429d398dfba893d40, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD pauseMenuUI: {fileID: 0} --- !u!224 &4158834148864819270 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9075173710402410956, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} m_PrefabInstance: {fileID: 4158834148864819266} m_PrefabAsset: {fileID: 0} -======= - pauseMenuUI: {fileID: 1230350817} ->>>>>>> bc988ab60ec64c0741074ee2dbaa85f27f64190f --- !u!1001 &4910321061857220295 PrefabInstance: m_ObjectHideFlags: 0