diff options
| author | lrknox <lrknox> | 2017-03-28 21:36:30 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-03-28 21:36:30 (GMT) |
| commit | a1dc1a5f28b99d30b7870f764c288995cabc7ad0 (patch) | |
| tree | 3670028d1e50066e57309271f84380dc06653069 | |
| parent | c7f3365015c85e539e8caf874c400ed3f5240d73 (diff) | |
| download | hdf5-a1dc1a5f28b99d30b7870f764c288995cabc7ad0.zip hdf5-a1dc1a5f28b99d30b7870f764c288995cabc7ad0.tar.gz hdf5-a1dc1a5f28b99d30b7870f764c288995cabc7ad0.tar.bz2 | |
Resolve conflict missed in merge.
| -rw-r--r-- | src/H5public.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/H5public.h b/src/H5public.h index 7d9a02d..2e73ec9 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -93,19 +93,11 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ -<<<<<<< HEAD #define H5_VERS_MINOR 10 /* For minor interface/format changes */ #define H5_VERS_RELEASE 2 /* For tweaks, bug-fixes, or development */ #define H5_VERS_SUBRELEASE "snap0" /* For pre-releases like snap0 */ /* Empty string for real releases. */ #define H5_VERS_INFO "HDF5 library version: 1.10.2-snap0" /* Full version string */ -======= -#define H5_VERS_MINOR 11 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 0 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ - /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.11.0" /* Full version string */ ->>>>>>> develop #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |