Merge Conflict Solved

ab5a79fd · Seungwon Ju · 4dc08df9 · f1b5d1d5 · ab5a79fd · ab5a79fd
Commit ab5a79fd authored Jul 05, 2018 by Seungwon Ju
Hide whitespace changes
Inline Side-by-side

Showing with 837 additions and 700 deletions

.DS_Store .DS_Store +0 -0

.DS_Store Assets/.DS_Store +0 -0

Game.unity Assets/Scenes/Game.unity +835 -698

UIManager.cs Assets/Script/UI/UIManager.cs +2 -2

No files found.
--- a/.DS_Store
+++ b/.DS_Store
--- a/Assets/.DS_Store
+++ b/Assets/.DS_Store
--- a/Assets/Scenes/Game.unity
+++ b/Assets/Scenes/Game.unity
--- a/Assets/Script/UI/UIManager.cs
+++ b/Assets/Script/UI/UIManager.cs
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using CivModel;
@@ -32,4 +32,4 @@ public class UIManager : MonoBehaviour
            if (go != mapUI) mapUI.SetActive(true);
        }
    }
-}
+}
\ No newline at end of file