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

diff --git a/src/rx/rx.c b/src/rx/rx.c
index a5ba549ad2bc30b5850813710ebc09bd3acf2139..5bfb8f6c1df10629fce65cbf93129a3fb36b79fa 100644 (file)
--- 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"