From: malaterre <malaterre>
Date: Tue, 6 Sep 2005 16:45:07 +0000 (+0000)
Subject: BUG: Smart... need to remove this thing
X-Git-Tag: Version1.2.bp~113
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cf4ed6fe6ba2358795d1a891c66719d959d87947;p=gdcm.git

BUG: Smart... need to remove this thing
---

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}")