feat: set up wallet

immutable · Nov 7, 2024 · 7c05e71 · 7c05e71
1 parent 3e7b6ed
commit 7c05e71
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Assets/Shared/Scripts/UI/MainMenu.cs b/Assets/Shared/Scripts/UI/MainMenu.cs
@@ -70,11 +70,7 @@ async void OnEnable()
             }
 
             ShowLoading(false);
-<<<<<<< HEAD
             // Show the logout button if the player is logged in
-=======
-            // Show the logout button if the user is logged in
->>>>>>> 28c6820 (feat: logout)
             ShowLogoutButton(SaveManager.Instance.IsLoggedIn);
         }