From f57ba957f4583f8af7280b3743f80ea8175c297b Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Mon, 19 Sep 2016 17:23:40 +0200
Subject: [PATCH] Fix merge conflicts

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/3ac83da39abe67d3af151330388432d5930251db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/system/helpers.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/system/helpers.h b/src/system/helpers.h
index 811695650..0508aeb26 100644
--- a/src/system/helpers.h
+++ b/src/system/helpers.h
@@ -100,6 +100,7 @@ class CFileHelpers
 		CFileHelpers();
 		~CFileHelpers();
 		static CFileHelpers* getInstance();
+		bool doCopyFlag;
 
 		void clearDebugInfo();
 		void readDebugInfo(helpersDebugInfo* di);