From 39f4a1aa8e19a6570c24bef2a71e0c078e7a1049 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Mon, 1 Jan 2024 15:34:05 +0100
Subject: [PATCH] conflict fixes

---
 .../Editor/TestSceneOsuEditorGrids.cs          | 18 ------------------
 .../Edit/OsuGridToolboxGroup.cs                |  5 -----
 2 files changed, 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
index 5636bb51b9..21427ba281 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorGrids.cs
@@ -129,23 +129,5 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private void gridSizeIs(int size)
             => AddAssert($"grid size is {size}", () => this.ChildrenOfType<RectangularPositionSnapGrid>().Single().Spacing.Value == new Vector2(size)
                                                        && EditorBeatmap.BeatmapInfo.GridSize == size);
-
-        [Test]
-        public void TestGridTypeToggling()
-        {
-            AddStep("enable rectangular grid", () => InputManager.Key(Key.Y));
-            AddUntilStep("rectangular grid visible", () => this.ChildrenOfType<RectangularPositionSnapGrid>().Any());
-            gridActive<RectangularPositionSnapGrid>(true);
-
-            nextGridTypeIs<TriangularPositionSnapGrid>();
-            nextGridTypeIs<CircularPositionSnapGrid>();
-            nextGridTypeIs<RectangularPositionSnapGrid>();
-        }
-
-        private void nextGridTypeIs<T>() where T : PositionSnapGrid
-        {
-            AddStep("toggle to next grid type", () => InputManager.Key(Key.H));
-            gridActive<T>(true);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
index 237ccf3e58..76e735449a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -25,10 +24,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public partial class OsuGridToolboxGroup : EditorToolboxGroup, IKeyBindingHandler<GlobalAction>
     {
-        private static readonly PositionSnapGridType[] grid_types = Enum.GetValues(typeof(PositionSnapGridType)).Cast<PositionSnapGridType>().ToArray();
-
-        private int currentGridTypeIndex;
-
         [Resolved]
         private EditorBeatmap editorBeatmap { get; set; } = null!;