From 0c94b7c0d599c564de1fbf243998dd79b54086eb Mon Sep 17 00:00:00 2001
From: madwind <madwind.cn@gmail.com>
Date: Wed, 5 Feb 2025 23:03:26 +0800
Subject: [PATCH] fix merge

---
 src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs            | 1 +
 src/Ryujinx/Utilities/Configuration/ConfigurationState.cs | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
index 21347ae8f..dc6b06796 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -6,6 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using System;
+using System.Linq;
 
 namespace Ryujinx.Ava.UI.Windows
 {
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
index f2bf502f7..0796041bb 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
@@ -130,8 +130,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
                 Hotkeys = Hid.Hotkeys,
-                KeyboardConfig = [],
-                ControllerConfig = [],
                 InputConfig = Hid.InputConfig,
                 GraphicsBackend = Graphics.GraphicsBackend,
                 PreferredGpu = Graphics.PreferredGpu,