From 6e0d803c0268f6d26556ddd37c73a88ce2d8dc8c Mon Sep 17 00:00:00 2001 From: laurids Date: Sun, 31 May 2020 14:39:46 +0200 Subject: [PATCH] merge fix --- Assets/GWConquest/Scenes/GalaxyMap.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 96efaee..635bd14 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -56733,7 +56733,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &2017850870 PrefabInstance: