mirror of
https://github.com/yggdrasil-network/yggdrasil-go.git
synced 2025-04-28 14:15:06 +03:00
Resolve merge conflict with platformdefaults
This commit is contained in:
commit
b24c7ffa6b
21 changed files with 170 additions and 106 deletions
|
@ -11,10 +11,12 @@ import "encoding/json"
|
|||
import "strconv"
|
||||
import "os"
|
||||
|
||||
import "yggdrasil/defaults"
|
||||
|
||||
type admin_info map[string]interface{}
|
||||
|
||||
func main() {
|
||||
server := flag.String("endpoint", "tcp://localhost:9001", "Admin socket endpoint")
|
||||
server := flag.String("endpoint", defaults.GetDefaults().DefaultAdminListen, "Admin socket endpoint")
|
||||
injson := flag.Bool("json", false, "Output in JSON format")
|
||||
flag.Parse()
|
||||
args := flag.Args()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue