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

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 9e49ddfcec1331f85bf07c8529b4df341d76b777..aff9d67aaf65cbac9c5a86500a9987fec10f9562 100644 (file)
--- 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