aboutsummaryrefslogtreecommitdiffstats
path: root/packet-spnego.c
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@ns.aus.com>2002-08-29 00:37:18 +0000
committerRichard Sharpe <sharpe@ns.aus.com>2002-08-29 00:37:18 +0000
commit16630b5038959975f04c6f06cded27f317378e42 (patch)
treed7381feb327050f2bca1e028b06a482e817a4a05 /packet-spnego.c
parente0523f9acb86285d943f3f2d679d4ad6324bd41d (diff)
Small fix up to packet-spnego.c
svn path=/trunk/; revision=6120
Diffstat (limited to 'packet-spnego.c')
-rw-r--r--packet-spnego.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-spnego.c b/packet-spnego.c
index 407333d317..a2cf43b36e 100644
--- a/packet-spnego.c
+++ b/packet-spnego.c
@@ -4,11 +4,7 @@
* Copyright 2002, Tim Potter <tpot@samba.org>
* Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com>
*
-<<<<<<< packet-spnego.c
- * $Id: packet-spnego.c,v 1.8 2002/08/29 00:35:55 sharpe Exp $
-=======
- * $Id: packet-spnego.c,v 1.8 2002/08/29 00:35:55 sharpe Exp $
->>>>>>> 1.7
+ * $id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>