Fix merge of openafs/src/afs/afs_pioctl.c

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index f89edd03e3a4c883635f0eead92642b01a5c14b0..3d47dc152a0c313ca077022888fd7bcaff5c9eb0 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -7,21 +7,12 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-<<<<<<< local
-#include <afsconfig.h>
-#include "../afs/param.h"
-
-RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_pioctl.c,v 1.17 2003/07/30 17:23:43 hartmans Exp $");
-
-||||||| base
-#include "../afs/param.h"      /* Should be always first */
-=======
 #include <afsconfig.h>
 #include "../afs/param.h"
 
 RCSID("$Header: /tmp/cvstemp/openafs/src/afs/afs_pioctl.c,v 1.1.1.18 2003/07/30 17:08:01 hartmans Exp $");
 
->>>>>>> new
+
 #include "../afs/sysincludes.h"        /* Standard vendor system headers */
 #include "../afs/afsincludes.h"        /* Afs-based standard headers */
 #include "../afs/afs_stats.h"   /* afs statistics */