From: jpr <jpr>
Date: Thu, 13 Mar 2003 17:00:10 +0000 (+0000)
Subject: fusion des updates CVS
X-Git-Tag: April2003~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bb267016446eab423df841903f11dff35e4898f8;p=gdcm.git

fusion des updates CVS
---

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 5d7a6617..efbbe43d 100644
--- 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;