From 3a3ea442000f4d46052ec2fb3194c6f1d653290f Mon Sep 17 00:00:00 2001
From: "milkdropper.com" <milkdropper.com@gmail.com>
Date: Sun, 24 May 2020 19:03:03 +0400
Subject: [PATCH] Conflict1

---
 src/libprojectM/Renderer/Renderer.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libprojectM/Renderer/Renderer.hpp b/src/libprojectM/Renderer/Renderer.hpp
index 2389d9e96..b9cb5980b 100644
--- a/src/libprojectM/Renderer/Renderer.hpp
+++ b/src/libprojectM/Renderer/Renderer.hpp
@@ -91,6 +91,8 @@ public:
   milliseconds lastTimeTouch;
   milliseconds currentTimeTouch;
 
+  std::string m_helpText;
+
   int totalframes;
   float realfps;