fixed conflict

2015-07-10 22:28:43 +02:00
parent 926ec808f5 ffab80188f
commit b87768478d
14 changed files with 322 additions and 165 deletions
@@ -7,7 +7,7 @@ public class PlayerAuth {

    private String nickname = "";
    private String hash = "";
-    private String ip = "198.18.0.1";
+    private String ip = "192.168.0.1";
    private long lastLogin = 0;
    private double x = 0;
    private double y = 0;