mirror of
https://github.com/ppy/osu.git
synced 2025-03-23 02:57:25 +08:00
Fix remaining merge conflict
This commit is contained in:
parent
ed368e44ea
commit
d94045e612
@ -61,7 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests
|
||||
private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
|
||||
{
|
||||
ExposedPlayer player;
|
||||
OsuScreenStack stack;
|
||||
|
||||
Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user