From 51ada88313d0c604fc94fa556132ff87acf2e21d Mon Sep 17 00:00:00 2001
From: SCM6WE <Marc-Felix.Schmitz@de.bosch.com>
Date: Thu, 23 Sep 2021 11:09:58 +0200
Subject: [PATCH] merge

---
 PolyChat/MainPage.xaml.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/PolyChat/MainPage.xaml.cs b/PolyChat/MainPage.xaml.cs
index 245e679..b91a0bb 100644
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -156,13 +156,8 @@ namespace PolyChat
                         new ChatMessage(
                             origin,
                             item["type"].ToString(),
-<<<<<<< Updated upstream
-                            item["content"].ToString()//,
-                                                      //DateTime.Parse(item["timestamp"].ToString())
-=======
                             item["content"].ToString(),
                             DateTime.Parse(item["timestamp"].ToString())
->>>>>>> Stashed changes
                         )
                     );
                 }