From 6bc0afdafb32c9e5728458fa8e099b39e9f7902a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 20:09:18 +0900
Subject: [PATCH] Fix remaining conflicts

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0bb3d25011..be3bca3242 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -13,7 +13,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -63,8 +62,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         }
 
         private WaveformGraph waveform;
-        private ControlPointPart controlPoints;
-        private TimelineTickDisplay ticks;
 
         private TimelineTickDisplay ticks;