From 8b1fef730dcb4cd4f21c3f90121b1c6a74758f63 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Sun, 17 May 2020 18:02:58 +0200
Subject: [PATCH] resolved conflict

---
 devicehandlers/DeviceHandlerBase.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h
index c48fbe5e..454f0751 100644
--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@@ -614,11 +614,7 @@ protected:
 	/**
 	 * Cookie used for communication
 	 */
-<<<<<<< HEAD
-	CookieIF * comCookie = nullptr;
-=======
 	CookieIF * comCookie;
->>>>>>> mueller_framework
 
 	struct DeviceCommandInfo {
 		bool isExecuting; //!< Indicates if the command is already executing.