last merge fix

This commit is contained in:
romanman 2014-08-05 11:49:18 +03:00
parent 1d2390e1fa
commit c02378563d
1 changed files with 11 additions and 11 deletions

View File

@ -2,16 +2,16 @@
# accept for incoming connections [true/false]
server.acceptConnections = false
# one default access point to start
# discover the network e.g. ip: [54.201.28.117] port: [30303]
# Peer Server Zero: peer discovery
#peer.discovery.ip = 54.201.28.117
#peer.discovery.port = 30303
# Peer Server One: peer discovery
peer.discovery.ip = 54.204.10.41
peer.discovery.port = 30303
# List of the peers to start
# the search of the online peers
# values: [ip:port, ip:port, ip:port ...]
peer.discovery.ip.list = 185.43.109.23:30303, \
54.211.14.10:30303, \
213.100.248.181:30303, \
54.72.69.180:30303, \
54.201.28.117:30303, \
70.29.74.8:7
# active peer ip and port
# that is the peer through
# we get the chain: [54.201.28.117] port: [30303]
@ -73,4 +73,4 @@ database.reset = true
# this string is computed
# to be eventually the address
# that get the miner reward
coinbase.secret = monkey
coinbase.secret = monkey