# Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
# Conflicts: # osu-resources # osu.Game/Overlays/Profile/Components/GradeBadge.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/Header/RankGraph.cs # osu.Game/Overlays/Profile/Header/SupporterIcon.cs # osu.Game/Overlays/Profile/ProfileHeader.cs
Also cleans up some weird code
# Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs
# Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln
Co-Authored-By: peppy <pe@ppy.sh>
misunderstood that earlier