From 31e81840e77a3e9bc02c60e8a47ffc9f9007940c Mon Sep 17 00:00:00 2001 From: romanman Date: Tue, 20 May 2014 21:42:07 +0300 Subject: [PATCH] merge for last pull --- .../main/java/org/ethereum/gui/ConnectionConsoleWindow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java b/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java index 46289d48..32d01f08 100644 --- a/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java +++ b/ethereumj-core/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java @@ -70,10 +70,10 @@ public class ConnectionConsoleWindow extends JFrame implements PeerListener{ public void run() { // new ClientPeer(thisConsole).connect("54.201.28.117", 30303); // peer discovery -// new ClientPeer(thisConsole).connect("82.217.72.169", 30303); // Nick + new ClientPeer(thisConsole).connect("82.217.72.169", 30303); // Nick // new ClientPeer(thisConsole).connect("54.204.10.41", 30303); - new ClientPeer(thisConsole).connect("54.211.14.10", 30303); +// new ClientPeer(thisConsole).connect("54.211.14.10", 30303); // new ClientPeer(thisConsole).connect("192.168.1.102", 30303); } };