Merge branch 'master' into master

1 files changed, 3 insertions, 2 deletions

diff --git a/src/client/gameui.h b/src/client/gameui.h
index 8a1b5650d..2278ad1d6 100644
--- a/src/client/gameui.h
+++ b/src/client/gameui.h
@@ -85,7 +85,8 @@ public:
 
 	const bool isChatVisible()
 	{
-		return m_flags.show_chat && m_recent_chat_count != 0 && m_profiler_current_page == 0;
+		return m_flags.show_chat && m_recent_chat_count != 0 &&
+		       m_profiler_current_page == 0;
 	}
 	void setChatText(const EnrichedString &chat_text, u32 recent_chat_count);
 
@@ -112,7 +113,7 @@ private:
 	gui::IGUIStaticText *m_guitext = nullptr;  // First line of debug text
 	gui::IGUIStaticText *m_guitext2 = nullptr; // Second line of debug text
 	gui::IGUIStaticText *m_guitext_coords = nullptr;
-	
+
 	gui::IGUIStaticText *m_guitext_info = nullptr; // At the middle of the screen
 	std::wstring m_infotext;