Fix merge errors.

This commit is contained in:
Dean Herbert
2017-03-14 22:11:38 +09:00
parent 12326f610e
commit 8176b4ef77
3 changed files with 4 additions and 0 deletions

View File

@ -10,8 +10,10 @@ using osu.Framework.Graphics;
using osu.Framework.MathUtils;
using osu.Game.Screens.Select.Leaderboards;
using osu.Game.Modes;
using osu.Game.Modes.Mods;
using osu.Game.Users;
using osu.Game.Modes.Osu;
using osu.Game.Modes.Osu.Mods;
namespace osu.Desktop.VisualTests
{