From 69b6100463f19dcd49485fc68a92559c4d2bd04a Mon Sep 17 00:00:00 2001
From: deredet <lucky.cahyadi@yahoo.com>
Date: Fri, 13 May 2016 21:07:15 +0700
Subject: [PATCH] Up
---
src/server/Server.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/server/Server.java b/src/server/Server.java
index df72b21..5a5b2f6 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -14,12 +14,8 @@ import org.json.JSONObject;
public class Server implements Runnable
{
-<<<<<<< HEAD
private Paxos paxos;
- private String host;
-=======
private String host;
->>>>>>> ea38ce9783fbf5ff22ca116817d787e2b4816894
private int port;
private Socket socket;
private final String DEFAULT_HOST = "localhost";
@@ -123,8 +119,7 @@ public class Server implements Runnable
}
}
}
-<<<<<<< HEAD
-=======
+
public String receiveMessage() throws IOException{
String temp = null;
@@ -142,6 +137,6 @@ public class Server implements Runnable
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
->>>>>>> ea38ce9783fbf5ff22ca116817d787e2b4816894
-}
\ No newline at end of file
+
+}
--
GitLab