summaryrefslogtreecommitdiff
path: root/client/Piztor/src/com/macaroon/piztor/UserInfo.java
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-27 11:17:11 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-27 11:17:11 +0800
commitec0922bb708fa561471e13c75ab51db06d0fe8e4 (patch)
tree265d2752b62495ee16695e8073729f0969667221 /client/Piztor/src/com/macaroon/piztor/UserInfo.java
parent21364472978aac014e42486ecb0b5b6f8e4ee7c2 (diff)
parentf8945d9f2be18b1c05d66a5e2dba351061e2a57b (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/src/com/macaroon/piztor/UserInfo.java')
-rw-r--r--client/Piztor/src/com/macaroon/piztor/UserInfo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Piztor/src/com/macaroon/piztor/UserInfo.java b/client/Piztor/src/com/macaroon/piztor/UserInfo.java
index 9c78fc3..d404c7e 100644
--- a/client/Piztor/src/com/macaroon/piztor/UserInfo.java
+++ b/client/Piztor/src/com/macaroon/piztor/UserInfo.java
@@ -1,8 +1,8 @@
package com.macaroon.piztor;
public class UserInfo {
- static String ip = "69.85.86.42";
-// static String ip = "192.168.1.101";
+// static String ip = "69.85.86.42";
+ static String ip = "192.168.1.101";
static int port = 2222;
static String token = null;
static String username = null;