RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 08:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-14 22:11:38 +09:00
parent 12326f610e
commit 8176b4ef77
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
View File

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

1
osu.Game/Modes/Score.cs
View File

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

1
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

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