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

@ -4,6 +4,7 @@
using osu.Game.Users;
using osu.Game.Database;
using System.ComponentModel;
using osu.Game.Modes.Mods;
namespace osu.Game.Modes
{

View File

@ -16,6 +16,7 @@ using osu.Framework.Allocation;
using System.Linq;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Extensions;
using osu.Game.Modes.Mods;
namespace osu.Game.Screens.Select.Leaderboards
{