fusion des updates CVS

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 5d7a66173d455928fd4f83399be296d83af91989..efbbe43d365b8c8ded58d0861bc4444315d8b303 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -1,14 +1,8 @@
-// $Id: gdcmElValSet.cxx,v 1.19 2003/03/13 15:56:26 jpr Exp $
+// $Id: gdcmElValSet.cxx,v 1.20 2003/03/13 17:00:10 jpr Exp $
 
 #include "gdcmUtil.h"
 #include "gdcmElValSet.h"
 
-<<<<<<< gdcmElValSet.cxx
-
-#include <vector>
-static void Tokenize (const string& str, vector<string>& tokens, const string& delimiters);
-
-
 
 TagElValueHT & gdcmElValSet::GetTagHt(void) {
        return tagHt;