resolved merge conflicts.

zsd-planekid · Dec 9, 2015 · 0f2065c · 0f2065c
1 parent 33c0dad
commit 0f2065c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/edu/cmu/cs/cs214/chat/gui/ClientPanel.java b/src/main/java/edu/cmu/cs/cs214/chat/gui/ClientPanel.java
@@ -197,10 +197,6 @@ public void startChat(String username, String port, String ip) {
      * lang.String)
      */
     @Override
-<<<<<<< HEAD
-    public void messageReceived(String username, String message) {
-        String newText = String.format(" %s: %s%n", username, message);
-=======
     public void messageReceived(Message msg) {
 
         // TODO: Make the server show the timestamp of the received message.
@@ -210,7 +206,6 @@ public void messageReceived(Message msg) {
 
         String newText = String.format(" %s: %s%n", msg.getSender(),
                 msg.getContent());
->>>>>>> master
         this.chatArea.append(newText);
         chatArea.setCaretPosition(chatArea.getDocument().getLength());
     }