From: Sam Hartman <hartmans@debian.org>
Date: Fri, 22 Oct 2004 19:46:49 +0000 (+0000)
Subject: Fix merge error in openafs/src/rx/rx.c
X-Git-Tag: debian/1.2.12-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cc8cc94109ad33aa53a2a417ba2d9fabb6518566;p=packages%2Fo%2Fopenafs.git

Fix merge error in openafs/src/rx/rx.c
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index a5ba549ad..5bfb8f6c1 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -16,10 +16,9 @@
 #include <afs/param.h>
 #endif
 
-RCSID("$Header: /tmp/cvstemp/openafs/src/rx/rx.c,v 1.1.1.15 2003/07/30 17:12:44 hartmans Exp $");
 
 RCSID("$Header: /cvs/openafs/src/rx/rx.c,v 1.22.2.30 2004/10/18 05:20:48 shadow Exp $");
->>>>>>> new
+
 
 #ifdef KERNEL
 #include "../afs/sysincludes.h"