diff --git a/Assets/Scenes/DeathScreen.unity.meta b/Assets/Scenes/DeathScreen.unity.meta index ed38d6b..6c86cc5 100644 --- a/Assets/Scenes/DeathScreen.unity.meta +++ b/Assets/Scenes/DeathScreen.unity.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta -guid: 97f4ab700605cdb42a6814eff80fb25c -======== -guid: 9fc0d4010bbf28b4594072e72b8655ab ->>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200:Assets/Scenes/DeathScreen.unity.meta +guid: 43c23d1fff294aa4b90d180240a2295a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 337d7ff..af0adbd 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -343,7 +343,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 0 + k__BackingField: 0.0005 k__BackingField: 0 curveOrigin: {fileID: 1053166410} --- !u!1 &100036927