aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-12-15 04:57:29 +0800
committerzelig <viktor.tron@gmail.com>2014-12-15 04:57:29 +0800
commit72290f67fee2be183981c9672d830040466187bd (patch)
treea98e9720b169aec5484472945726a326d4b75631 /cmd/utils
parent4c89d5331f41fa93e6840893c6727b05eabe5f99 (diff)
downloaddexon-72290f67fee2be183981c9672d830040466187bd.tar
dexon-72290f67fee2be183981c9672d830040466187bd.tar.gz
dexon-72290f67fee2be183981c9672d830040466187bd.tar.bz2
dexon-72290f67fee2be183981c9672d830040466187bd.tar.lz
dexon-72290f67fee2be183981c9672d830040466187bd.tar.xz
dexon-72290f67fee2be183981c9672d830040466187bd.tar.zst
dexon-72290f67fee2be183981c9672d830040466187bd.zip
resolve merge conflict hell
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/cmd.go11
1 files changed, 1 insertions, 10 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 867ef5e37..3e3ac617a 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -154,22 +154,13 @@ func NatType(natType string, gateway string) (nat p2p.NAT) {
nat = p2p.UPNP()
case "PMP":
ip := net.ParseIP(gateway)
-<<<<<<< HEAD
- if ip != nil {
- clilogger.Fatalf("bad PMP gateway '%s'", gateway)
-=======
if ip == nil {
- clilogger.Fatalln("cannot resolve PMP gateway IP %s", gateway)
->>>>>>> adapt cmd/cli to new backend
+ clilogger.Fatalf("cannot resolve PMP gateway IP %s", gateway)
}
nat = p2p.PMP(ip)
case "":
default:
-<<<<<<< HEAD
clilogger.Fatalf("unrecognised NAT type '%s'", natType)
-=======
- clilogger.Fatalln("unrecognised NAT type %s", natType)
->>>>>>> adapt cmd/cli to new backend
}
return
}