merge

2021-09-23 11:09:58 +02:00
parent 766a8171f0
commit 51ada88313
1 changed files with 0 additions and 5 deletions
--- 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
                        )
                    );
                }