From a1dc1a5f28b99d30b7870f764c288995cabc7ad0 Mon Sep 17 00:00:00 2001 From: lrknox Date: Tue, 28 Mar 2017 16:36:30 -0500 Subject: Resolve conflict missed in merge. --- src/H5public.h | 8 -------- 1 file changed, 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) -- cgit v0.12