From 60ffad169fc1c1984537aff5f4eb5963728254a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Nov 2018 11:47:48 +0900
Subject: [PATCH] Fix post-merge errors

---
 .../ManiaSelectionBlueprintTestCase.cs                        | 4 ++--
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                | 2 +-
 osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestCase.cs b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestCase.cs
index f64e54c878..50de5ce7a3 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestCase.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestCase.cs
@@ -7,8 +7,8 @@ using osu.Framework.Timing;
 using osu.Game.Rulesets.Mania.Edit;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
-using OpenTK;
-using OpenTK.Graphics;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 6752378dfd..fc0180069d 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             Position = Parent.ToLocalSpace(HitObject.ToScreenSpace(Vector2.Zero));
         }
-        }
 
         public override void Show()
         {
@@ -54,5 +53,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             HitObject.AlwaysAlive = false;
             base.Hide();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 944e634c9c..4cb417a32e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
-using OpenTK;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {