conflicts solved

.idea/modules.xml

@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-<<<<<<< HEAD
       <module fileurl="file://$PROJECT_DIR$/infinitymonkeys.iml" filepath="$PROJECT_DIR$/infinitymonkeys.iml" />
-=======
-      <module fileurl="file://$PROJECT_DIR$/comp90015-dsass2-infinitymonkeys-remaster.iml" filepath="$PROJECT_DIR$/comp90015-dsass2-infinitymonkeys-remaster.iml" />
->>>>>>> 37a6af2e6d36ab514d01a93dbd5be6538a2572c7
     </modules>
   </component>
 </project>
\ No newline at end of file

src/GUI/ChatScreen.java

@@ -54,8 +54,6 @@ public class ChatScreen {
         frame.setVisible(true);
 
         SwingUtilities.getRootPane(sendButton).setDefaultButton(sendButton);
-<<<<<<< HEAD
-=======
 
         frame.addWindowListener(new WindowAdapter()
         {
@@ -82,7 +80,6 @@ public class ChatScreen {
             }
         });
 
->>>>>>> mpriymak
     }
 
     private void createUIComponents() {

src/server/User.java

@@ -7,21 +7,12 @@ import remote.IDrawingUpdate;
 public class User
 {
     private String username;
-<<<<<<< HEAD
     private remote.IChatUpdate IChatUpdate;
     private remote.IDrawingUpdate IDrawingUpdate;
     private remote.IClientUpdate IClientUpdate;
     private boolean isAdmin;
-
     public User(String username, remote.IChatUpdate IChatUpdate, remote.IClientUpdate IClientUpdate, remote.IDrawingUpdate IDrawingUpdate)
-=======
-    private IChatUpdate IChatUpdate;
-    private IDrawingUpdate IDrawingUpdate;
-    private IClientUpdate IClientUpdate;
-    private boolean isAdmin;
 
-    public User(String username, IChatUpdate IChatUpdate, IClientUpdate IClientUpdate, IDrawingUpdate IDrawingUpdate)
->>>>>>> mpriymak
     {
         this.username = username;
         this.IChatUpdate = IChatUpdate;
@@ -50,16 +41,11 @@ public class User
         return this.IChatUpdate;
     }
 
-<<<<<<< HEAD
     public remote.IClientUpdate getIClientUpdate()
     {
         return this.IClientUpdate;
     }
 
     public remote.IDrawingUpdate getIDrawingUpdate() { return this.IDrawingUpdate; }
-=======
-    public IDrawingUpdate getIDrawingUpdate() { return this.IDrawingUpdate; }
 
-    public IClientUpdate getIClientUpdate() { return this.IClientUpdate; }
->>>>>>> mpriymak
 }