fixed conflict

2015-07-10 22:28:43 +02:00
parent 926ec808f5 ffab80188f
commit b87768478d
14 changed files with 322 additions and 165 deletions
@@ -48,7 +48,7 @@ public class xAuthToFlat {
                String pl = getIdPlayer(id);
                String psw = getPassword(id);
                if (psw != null && !psw.isEmpty() && pl != null) {
-                    PlayerAuth auth = new PlayerAuth(pl, psw, "198.18.0.1", 0, "your@email.com");
+                    PlayerAuth auth = new PlayerAuth(pl, psw, "192.168.0.1", 0, "your@email.com");
                    database.saveAuth(auth);
                }
            }