chore: fix merge conflicts

immutable · May 29, 2024 · fac5145 · fac5145
1 parent bbfe469
commit fac5145
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
@@ -62,11 +62,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);
         }