status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor

This commit is contained in:
romanman 2014-05-27 10:25:45 +03:00
parent 959c7d2d9e
commit 3f0fea6a08
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethereumj-core/src/main/java/org/ethereum/manager/MainData.java
View File

@ -57,12 +57,8 @@ public class MainData {
System.exit(-1); System.exit(-1);
} }
<<<<<<< HEAD
PeerData peer = new PeerData( PeerData peer = new PeerData(
ip.getAddress(), port, new byte[]{00}); ip.getAddress(), port, new byte[]{00});
=======
PeerData peer = new PeerData(ip.getAddress(), (short) 30303, new byte[] { 00 });
>>>>>>> d52f5868c293bff76394d6e014833a7dd17b5722
peers.add(peer); peers.add(peer);
byte[] cowAddr = HashUtil.sha3("cow".getBytes()); byte[] cowAddr = HashUtil.sha3("cow".getBytes());