Resolve conflict

[platform/upstream/libpcap.git] / pcap_set_promisc.3pcap

diff --git a/pcap_set_promisc.3pcap b/pcap_set_promisc.3pcap
index 382260c..fcd797a 100644 (file)
--- a/pcap_set_promisc.3pcap
+++ b/pcap_set_promisc.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_promisc.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"    The Regents of the University of California.  All rights reserved.
 .\"
@@ -19,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.TH PCAP_SET_PROMISC 3PCAP "5 April 2008"
+.TH PCAP_SET_PROMISC 3PCAP "3 January 2014"
 .SH NAME
 pcap_set_promisc \- set promiscuous mode for a not-yet-activated
 capture handle