diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-07-29 22:21:21 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-07-29 22:21:21 (GMT) |
| commit | 4890c5327eae6c05607a07984557991d9e8a6ff1 (patch) | |
| tree | b702e91f218ec94013dd9114cc29464919843ea7 | |
| parent | 8640a90adb739167ce5c8a4936b56eda7f68bf0c (diff) | |
| download | hdf5-4890c5327eae6c05607a07984557991d9e8a6ff1.zip hdf5-4890c5327eae6c05607a07984557991d9e8a6ff1.tar.gz hdf5-4890c5327eae6c05607a07984557991d9e8a6ff1.tar.bz2 | |
[svn-r25491] Correct package/version conflicts that were missed out from previous merge.
Tested on jam, koala, ostrich, platypus.
| -rw-r--r-- | vms/src/h5pubconf.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index af46751..ae85dce 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -508,11 +508,7 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -<<<<<<< .working -#define H5_PACKAGE_STRING "HDF5 1.9.178-swmr0" -======= -#define H5_PACKAGE_STRING "HDF5 1.9.184" ->>>>>>> .merge-right.r25266 +#define H5_PACKAGE_STRING "HDF5 1.9.184-swmr0" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" @@ -521,11 +517,7 @@ #define H5_PACKAGE_URL "" /* Define to the version of this package. */ -<<<<<<< .working -#define H5_PACKAGE_VERSION "1.9.178-swmr0" -======= -#define H5_PACKAGE_VERSION "1.9.184" ->>>>>>> .merge-right.r25266 +#define H5_PACKAGE_VERSION "1.9.184-swmr0" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "ll" |