Refactor

peer/peer.go

@@ -11,10 +11,7 @@ import (
 	"net/http"
 	"net/netip"
 	"net/url"
-<<<<<<< HEAD
 	"os"
-=======
->>>>>>> 69f2536 (WIP)
 	"vppn/m"
 )
 
@@ -53,7 +50,6 @@ func newPeerMain(args mainArgs) *peerMain {
 		log.Fatalf("Failed to load network state: %v", err)
 	}
 
-<<<<<<< HEAD
 	startupCount, err := loadStartupCount(args.NetName)
 	if err != nil {
 		if !os.IsNotExist(err) {
@@ -70,8 +66,6 @@ func newPeerMain(args mainArgs) *peerMain {
 		log.Fatalf("Failed to write startup count: %v", err)
 	}
 
-=======
->>>>>>> 69f2536 (WIP)
 	iface, err := openInterface(config.Network, config.LocalPeerIP, args.NetName)
 	if err != nil {
 		log.Fatalf("Failed to open interface: %v", err)
@@ -99,11 +93,7 @@ func newPeerMain(args mainArgs) *peerMain {
 		localAddr = netip.AddrPortFrom(ip, localPeer.Port)
 	}
 
-<<<<<<< HEAD
 	g := NewGlobals(config, startupCount, localAddr, conn, iface)
-=======
-	g := NewGlobals(config, localAddr, conn, iface)
->>>>>>> 69f2536 (WIP)
 
 	hubPoller, err := NewHubPoller(g, args.NetName, args.HubAddress, args.APIKey)
 	if err != nil {