Skip to content

Commit c4814dc

Browse files
committed
feat: set up wallet
1 parent e6ca913 commit c4814dc

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Assets/Shared/Scripts/UI/MainMenu.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,7 @@ async void OnEnable()
7070
}
7171

7272
ShowLoading(false);
73-
<<<<<<< HEAD
7473
// Show the logout button if the player is logged in
75-
=======
76-
// Show the logout button if the user is logged in
77-
>>>>>>> 28c6820 (feat: logout)
7874
ShowLogoutButton(SaveManager.Instance.IsLoggedIn);
7975
}
8076

0 commit comments

Comments
 (0)