From 61c3aad53791c838d5d20e6f93a77d6bdb0ac9ab Mon Sep 17 00:00:00 2001
From: Daniel Power <me@danielpower.ca>
Date: Wed, 27 Aug 2025 20:00:56 -0230
Subject: [PATCH] Fix conflict

---
 osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 068471ae49..e9f70180e1 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -133,8 +133,8 @@ namespace osu.Game.Tests.Visual.Settings
         {
             public Bindable<Vector2> AreaOffset { get; } = new Bindable<Vector2>();
             public Bindable<Vector2> AreaSize { get; } = new Bindable<Vector2>();
-            public Bindable<Vector2> OutputAreaSize { get; } = new Bindable<Vector2>();
             public Bindable<Vector2> OutputAreaOffset { get; } = new Bindable<Vector2>();
+            public Bindable<Vector2> OutputAreaSize { get; } = new Bindable<Vector2>();
 
             public Bindable<float> Rotation { get; } = new Bindable<float>();