diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
commit | 628d267162895adef5a73e1cd5810030cc98335a (patch) | |
tree | 05471ae798eaef041ea98fecdd285c9380ce381a /test/tmisc.c | |
parent | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (diff) | |
parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
download | hdf5-628d267162895adef5a73e1cd5810030cc98335a.zip hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.gz hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'test/tmisc.c')
-rw-r--r-- | test/tmisc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/tmisc.c b/test/tmisc.c index 93bdf29..62d9cd4 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -135,7 +135,6 @@ typedef struct #ifndef H5_HAVE_PARALLEL #define MISC8_DSETNAME2 "Dataset2" #define MISC8_DSETNAME3 "Dataset3" -#define MISC8_DSETNAME4 "Dataset4" #define MISC8_DSETNAME6 "Dataset6" #define MISC8_DSETNAME7 "Dataset7" #define MISC8_DSETNAME9 "Dataset9" |