From: malaterre <malaterre>
Date: Tue, 6 Sep 2005 16:44:21 +0000 (+0000)
Subject: ENH: Try to purposely commit conflit
X-Git-Tag: Version1.2.bp~114
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8ad2602dcd9d0df091b75e4c54268a1017e9252b;p=gdcm.git

ENH: Try to purposely commit conflit
---

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