This commit is contained in:
SCM6WE
2021-09-23 12:55:31 +02:00
committed by Felix Hartmann (PEA3-Fe-FI)
parent 43d8b2919c
commit 3cf0197672
3 changed files with 76 additions and 37 deletions

View File

@@ -171,7 +171,11 @@ namespace PolyChat
origin,
item["type"].ToString(),
item["content"].ToString()//,
<<<<<<< HEAD
//DateTime.Parse(item["timestamp"].ToString())
=======
//DateTime.Parse(item["timestamp"].ToString())
>>>>>>> be4eada (stuff)
)
);
}