From 53e9db9d001de471fc70855b465644d43db893e6 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 22 Oct 2004 19:52:34 +0000 Subject: [PATCH] Fix merge of openafs/src/afs/afs_pioctl.c --- src/afs/afs_pioctl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index f89edd03e..3d47dc152 100644 --- 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 -#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 #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 */ -- 2.39.5