From 54dab29f5b4c4370af4d63b84a1b6f012eb6e129 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sun, 15 Sep 2024 14:55:39 +0100 Subject: [PATCH] Fix bad merge on main scene [CI BUILD] --- Assets/Scenes/Main.unity | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 489b5a465..c980c9492 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -10173,7 +10173,6 @@ Transform: - {fileID: 1251041024} - {fileID: 128408298} - {fileID: 8282789105019930893} - - {fileID: 621655958} - {fileID: 402490430} - {fileID: 621655958} - {fileID: 1804317401} @@ -10449,12 +10448,6 @@ Transform: m_PrefabInstance: {fileID: 2135251106} m_PrefabAsset: {fileID: 0} --- !u!4 &621655958 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7492514809118701361, guid: 4cc8817a1d87e2247a553ebb5a78735a, - type: 3} - m_PrefabInstance: {fileID: 7492514809570787495} - m_PrefabAsset: {fileID: 0} ---- !u!4 &621655958 stripped Transform: m_CorrespondingSourceObject: {fileID: 7492514809118701361, guid: 4cc8817a1d87e2247a553ebb5a78735a, type: 3} @@ -31461,9 +31454,6 @@ MonoBehaviour: - m_Type: 9 m_StencilPrefab: {fileID: 114000010150538192, guid: ecebdb0665594e5fa660d0791b73b7f9, type: 3} - - m_Type: 9 - m_StencilPrefab: {fileID: 114000010150538192, guid: ecebdb0665594e5fa660d0791b73b7f9, - type: 3} m_StencilAttractDist: 0.5 m_StencilAttachHysteresis: 0.1 m_StencilLayerName: StencilObject