From d94045e612cf0d4e1105078fdf66512bacdc5b09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Feb 2020 02:12:50 +0900
Subject: [PATCH] Fix remaining merge conflict

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 7cf40b1209..bbb50c287b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -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);