Anton Kaliaev 747b73cb95 fix merge conflicts

2018-02-09 21:32:29 +04:00

..

conn_go110.go

p2p: tmconn->conn and types->p2p

2018-01-21 00:34:41 -05:00

conn_notgo110.go

p2p: tmconn->conn and types->p2p

2018-01-21 00:34:41 -05:00

connection_test.go

fix merge conflicts

2018-02-09 21:32:29 +04:00

connection.go

fix merge conflicts

2018-02-09 21:32:29 +04:00

secret_connection_test.go

close return channel when we're done

2018-02-09 21:32:29 +04:00

secret_connection.go

p2p: tmconn->conn and types->p2p

2018-01-21 00:34:41 -05:00