[FIX] fixed merge conflicts

2020-10-21 20:56:38 +02:00
parent 298bd760e5 a4e45b1a6b
commit 61577e0df7
9 changed files with 94 additions and 32 deletions
--- a/SharedClientServer/User.cs
+++ b/SharedClientServer/User.cs
@@ -10,6 +10,7 @@ namespace SharedClientServer
        private string _username;
        private int _score;
        private bool _host;
+        private string _message;

        [JsonConstructor]
        public User(string username, int score, bool host)