From 33c721bcbb51d50f9d60d656208eb31538f7b6b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Mar 2018 09:51:32 +0900
Subject: [PATCH] Fix post-merge errors

---
 osu-framework                   | 2 +-
 osu.Game/Screens/Play/Player.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu-framework b/osu-framework
index 865b0df18b..59004b46f2 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 865b0df18bb240190cdf7a7f60d44c0b28c84c5f
+Subproject commit 59004b46f2c96ac02fec712e66f9f96fe252f2fa
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6453a72fc3..c8ff261a93 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -25,7 +25,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards.Drawables;