mirror of
https://github.com/ppy/osu.git
synced 2025-03-09 21:27:18 +08:00
# Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Osu/OsuRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs # osu.Game/Rulesets/Ruleset.cs