Merge conflicts

This commit is contained in:
DrabWeb
2017-03-13 09:44:22 -03:00
parent dbc8d513f9
commit 442a2c97db
5 changed files with 4 additions and 11 deletions

View File

@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests
{
class TestCaseLeaderboard : TestCase
{
public override string Name => @"Leaderboard";
public override string Description => @"From song select";
private Leaderboard leaderboard;