From f384c7228e7a0dc81f4c140318f805386e972bf0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Oct 2018 17:28:23 +0900
Subject: [PATCH] Fix post-merge issues

---
 osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs | 2 +-
 osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs     | 3 ++-
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs        | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
index 1ddec9681f..dbe6ebb02a 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-            Size = Vector2.One
+                Size = Vector2.One
             };
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
index 7b02682688..5da6c2535d 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
@@ -29,7 +29,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             }
 
             protected override CursorContainer CreateCursor() => null;
+
+            protected override Playfield CreatePlayfield() => new OsuPlayfield { Size = Vector2.One　};
         }
-        protected override Playfield CreatePlayfield() => new OsuPlayfield { Size = Vector2.One　};
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 5fb71505eb..8bf14e3730 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -11,7 +11,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Masks;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {