From 5fb2c390b38c816fa496f52583d260358fa809ce Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Fri, 11 Aug 2023 09:13:49 +0200
Subject: [PATCH] FIX: resolved confilcts

---
 include/SimCore/data.hpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/SimCore/data.hpp b/include/SimCore/data.hpp
index 913d007..6b619bc 100644
--- a/include/SimCore/data.hpp
+++ b/include/SimCore/data.hpp
@@ -16,15 +16,11 @@ namespace SimCore
 
             }
 
-            Data(T val):data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
+            Data(T val):mx(),data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
             {
 
             }
 
-            Data(T val):data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
-            {
-
-            }
 
             Data (const Data &other)
             {