From 72290f67fee2be183981c9672d830040466187bd Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 14 Dec 2014 20:57:29 +0000
Subject: resolve merge conflict hell

---
 cmd/utils/cmd.go | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'cmd/utils/cmd.go')

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