X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=98f974bbfce131564bdf9fc47aa492c77b568a1f;hb=2039f4b8512f86134db9c85ea3d4645c3b8ab191;hp=2c3048f0cb32593787123e9f7e7a4c2f491e79a6;hpb=8ad2602dcd9d0df091b75e4c54268a1017e9252b;p=gdcm.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3048f0..98f974bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,11 +6,7 @@ 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}")