felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

merge

Browse Source
This commit is contained in:
SCM6WE
2021-09-23 11:09:58 +02:00
parent 766a8171f0
commit 51ada88313
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PolyChat/MainPage.xaml.cs
View File

@@ -156,13 +156,8 @@ namespace PolyChat
new ChatMessage( new ChatMessage(
origin, origin,
item["type"].ToString(), item["type"].ToString(),
<<<<<<< Updated upstream
item["content"].ToString()//,
//DateTime.Parse(item["timestamp"].ToString())
=======
item["content"].ToString(), item["content"].ToString(),
DateTime.Parse(item["timestamp"].ToString()) DateTime.Parse(item["timestamp"].ToString())
>>>>>>> Stashed changes
) )
); );
} }