stuff
This commit is contained in:
committed by
Felix Hartmann (PEA3-Fe-FI)
parent
43d8b2919c
commit
3cf0197672
@@ -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)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user