mirror of
https://github.com/ppy/osu.git
synced 2025-03-28 01:37:46 +08:00
# Conflicts: # osu.Desktop.Tests/Visual/TestCaseTaikoHitObjects.cs # osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj