From cc8cc94109ad33aa53a2a417ba2d9fabb6518566 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 22 Oct 2004 19:46:49 +0000 Subject: [PATCH] Fix merge error in openafs/src/rx/rx.c --- src/rx/rx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 #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" -- 2.39.5