ENH: Try to purposely commit conflit

[gdcm.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98f974bbfce131564bdf9fc47aa492c77b568a1f..2c3048f0cb32593787123e9f7e7a4c2f491e79a6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 # GDCM version number, usefull for packaging and doxygen doc:
 SET(GDCM_MAJOR_VERSION 1)
 SET(GDCM_MINOR_VERSION 1)
+<<<<<<< CMakeLists.txt
+SET(GDCM_BUILD_VERSION 0)
+=======
 SET(GDCM_BUILD_VERSION 1)
+>>>>>>> 1.72
 SET(GDCM_VERSION 
     "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}")