From 168350fb3b3c364c4df614f5230ee2d23f68904d Mon Sep 17 00:00:00 2001
From: Hai HoDac <hhodac@student.unimelb.edu.au>
Date: Sun, 20 Oct 2019 20:38:58 +1100
Subject: [PATCH] Conflicts solved
---
src/client/Client.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/client/Client.java b/src/client/Client.java
index 16bd12a..4601865 100644
--- a/src/client/Client.java
+++ b/src/client/Client.java
@@ -80,7 +80,7 @@ public class Client
chatController = (IChatController) registryServer.lookup("ChatController");
clientController = (IClientController) registryServer.lookup("ClientController");
- if (clientController.join(userName, this.chatUpdate))
+ if (clientController.join(userName, this.chatUpdate, this.drawingUpdate))
{
System.out.println("Connected to server");
--
GitLab