From: guy <guy>
Date: Tue, 27 Jan 2004 20:09:17 +0000 (+0000)
Subject: Propagate Hannes' change from the main branch:
X-Git-Tag: tcpdump-3.8.2~38
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/92b6ab38026f670ba8151421e7572e4057d048fc

Propagate Hannes' change from the main branch:
	remove broken rcsid at EOF
---

diff --git a/CHANGES b/CHANGES
index b8ade169..1e01804a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Header: /tcpdump/master/tcpdump/CHANGES,v 1.84 2003-11-13 04:06:02 mcr Exp $
+$Header: /tcpdump/master/tcpdump/CHANGES,v 1.84.2.1 2004-01-27 20:09:17 guy Exp $
 
 Wed.   November 12, 2003. mcr@sandelman.ottawa.on.ca. Summary for 3.8 release
 
@@ -708,9 +708,3 @@ v2.0.1 Sun Jan 26 21:10:10 PDT
 v2.0 Sun Jan 13 12:20:40 PST 1991
 
 - Initial public release.
-
-<<<<<<< CHANGES
-@(#) $Header: /tcpdump/master/tcpdump/CHANGES,v 1.84 2003-11-13 04:06:02 mcr Exp $ (LBL)
-=======
-@(#) $Header: /tcpdump/master/tcpdump/CHANGES,v 1.84 2003-11-13 04:06:02 mcr Exp $ (LBL)
->>>>>>> 1.81.2.1