From: Joel Sing <jsing@google.com>
Date: Mon, 4 Jun 2012 16:12:23 +0000 (+1000)
Subject: net: fix botched cgo netbsd merge
X-Git-Tag: go1.1rc2~3002
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=622ace8ffe6aab56c35bf80c3a9853c833839a15;p=gostls13.git

net: fix botched cgo netbsd merge

Fix botched cgo_netbsd.go merge and remove redundant +build directive.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6282048
---

diff --git a/src/pkg/net/cgo_netbsd.go b/src/pkg/net/cgo_netbsd.go
index 84ade5932f..aeaf8e568a 100644
--- a/src/pkg/net/cgo_netbsd.go
+++ b/src/pkg/net/cgo_netbsd.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build netbsd
-
 package net
 
 /*
@@ -12,9 +10,5 @@ package net
 import "C"
 
 func cgoAddrInfoFlags() C.int {
-<<<<<<< local
 	return C.AI_CANONNAME
-=======
-	return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
->>>>>>> other
 }