git: 9fcc6175008c - stable/13 - man: fix socket.2 merge from a16f805f820e

From: Alexander V. Chernikov <melifaro_at_FreeBSD.org>
Date: Tue, 24 Jan 2023 21:46:46 UTC 
The branch stable/13 has been updated by melifaro:

URL: https://cgit.FreeBSD.org/src/commit/?id=9fcc6175008cf0aea9dce6d30f4259080b791325

commit 9fcc6175008cf0aea9dce6d30f4259080b791325
Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
AuthorDate: 2023-01-24 21:44:51 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
CommitDate: 2023-01-24 21:44:51 +0000

    man: fix socket.2 merge from a16f805f820e
    
    Reported by:    Herbert J. Skuhra<herbert@gojira.at>
---
 lib/libc/sys/socket.2 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 7cff244345e9..cbe74809d214 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -65,11 +65,8 @@ PF_LINK		Link layer interface,
 PF_KEY		Internal key-management function,
 PF_NATM		Asynchronous transfer mode protocols,
 PF_NETGRAPH	Netgraph sockets,
-<<<<<<< HEAD
 PF_IEEE80211	IEEE 802.11 wireless link-layer protocols (WiFi),
-=======
 PF_NETLINK	Netlink protocols,
->>>>>>> b0286ee504c6 (man: add Netlink reference to socket(2))
 PF_BLUETOOTH	Bluetooth protocols,
 PF_INET_SDP	OFED socket direct protocol (IPv4),
 PF_INET6_SDP	OFED socket direct protocol (IPv6)