Tomofumi Hayashi 9f00ea47f5 Fix rebase conflicts.

2018-11-09 00:15:35 +09:00

..

conf_test.go

Default network readiness fix conflicts after rebase

2018-10-11 11:27:18 +09:00

conf.go

Fix rebase conflicts.

2018-11-09 00:15:35 +09:00

types.go

Change json field name to align with NPWG spec v1.

2018-11-09 00:15:35 +09:00