From: malaterre <malaterre>
Date: Tue, 13 Jan 2004 17:08:46 +0000 (+0000)
Subject:  remove problem of CVS. please use cvs -C to resolve conflicts
X-Git-Tag: Version0.3.1~5
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b0745f542bc5ff8332c1f8445e7181279d12aefe;p=gdcm.git

 remove problem of CVS. please use cvs -C to resolve conflicts
---

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9e49ddfc..aff9d67a 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -25,17 +25,6 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
 )
 
-<<<<<<< CMakeLists.txt
-SET(dcm2acr_SOURCES
-  dcm2acr.cxx
-)
-ADD_EXECUTABLE(dcm2acr ${dcm2acr_SOURCES})
-
-SET(explDICOMDIR_SOURCES
-  explDICOMDIR.cxx
-)
-ADD_EXECUTABLE(explDICOMDIR ${explDICOMDIR_SOURCES})
-=======
 # Loop over files and create executables
 FOREACH(file ${TEST_SOURCES})
   #Doh ! I need to specify each time the compile flags !
@@ -49,4 +38,3 @@ FOREACH(file ${TEST_SOURCES})
   ADD_EXECUTABLE(${name} ${file})
   TARGET_LINK_LIBRARIES(${name} gdcm)
 ENDFOREACH(file ${TEST_SOURCES})
->>>>>>> 1.4