From 634f06ac04015be9caf5cec8b63a9122f585b6c4 Mon Sep 17 00:00:00 2001
From: Chadnaut <63690461+Chadnaut@users.noreply.github.com>
Date: Mon, 13 Jan 2025 23:09:47 +0800
Subject: [PATCH] Merge fix

---
 src/fe_overlay.hpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/fe_overlay.hpp b/src/fe_overlay.hpp
index 23fb9be8..0737cfd1 100644
--- a/src/fe_overlay.hpp
+++ b/src/fe_overlay.hpp
@@ -71,15 +71,13 @@ friend class FeConfigContextImp;
 		sf::Vector2f &text_scale,
 		int &char_size ) const;
 
-	void input_map_dialog( const std::string &msg_str, FeInputMapEntry &res,
-			FeInputMap::Command &conflict );
-	int display_config_dialog( FeBaseConfigMenu *, bool & );
 	void input_map_dialog(
 		const std::string &msg_str,
 		FeInputMapEntry &res,
 		FeInputMap::Command &conflict
 	);
 
+	int display_config_dialog( FeBaseConfigMenu *, bool & );
 	int display_config_dialog(
 		FeBaseConfigMenu *m,
 		bool &parent_setting_changed,