summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1999-10-23 00:10:02 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1999-10-23 00:10:02 (GMT)
commit69fc209302fcf4ddd14d993b1e1aab78830c473c (patch)
tree9b8a5ee6319734db7c4d3a126e70af86a777a759
parent361897d767420803bee8b96805567b224c84e4a2 (diff)
downloadhdf5-69fc209302fcf4ddd14d993b1e1aab78830c473c.zip
hdf5-69fc209302fcf4ddd14d993b1e1aab78830c473c.tar.gz
hdf5-69fc209302fcf4ddd14d993b1e1aab78830c473c.tar.bz2
[svn-r1787] Removed CVS merged warnings stuff that got check in by mistake.
-rw-r--r--src/H5FDmpio.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h
index dab4d5e..fb61498 100644
--- a/src/H5FDmpio.h
+++ b/src/H5FDmpio.h
@@ -46,13 +46,8 @@ __DLL__ htri_t H5FD_mpio_tas_allsame(H5FD_t *_file, hbool_t newval);
__DLL__ MPI_Comm H5FD_mpio_communicator(H5FD_t *_file);
__DLL__ herr_t H5FD_mpio_setup(H5FD_t *_file, MPI_Datatype btype, MPI_Datatype ftype,
haddr_t disp, hbool_t use_types);
-<<<<<<<<<<<<<< variant A
-__DLL__herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
-__DLL__herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
->>>>>>>>>>>>>> variant B
__DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
__DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
-======= end of combination
#endif /*HAVE_PARALLEL*/