diff options
Diffstat (limited to 'packet-spnego.c')
| -rw-r--r-- | packet-spnego.c | 6 |
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> |