gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve merge conflict hell

Browse Source
This commit is contained in:
zelig
2014-12-14 20:57:29 +00:00
parent 4c89d5331f
commit 72290f67fe
4 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/utils/cmd.go
View File

@ -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
}