fix connection establishment when loading files

2021-09-23 11:09:43 +02:00
parent 54266e52ec
commit 766a8171f0
3 changed files with 14 additions and 1 deletions
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -156,8 +156,13 @@ 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
                        )
                    );
                }