Merge fix

oomek · Jan 13, 2025 · 634f06a · 634f06a
1 parent c72ceeb
commit 634f06a
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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,