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