--- branches/hidra/import_xml/convert_delimiter.pl	2004/03/14 20:34:24	291
+++ branches/hidra/import_xml/convert_delimiter.pl	2006/05/24 18:07:38	740
@@ -14,11 +14,7 @@
 
 	close(XML);
 
-<<<<<<< .working
-	if ($xml =~ s,<(\w+)\s+delimiter\s*=\s*"(\s[^"]+|[^"]+\s)"\s*>(.*?)</\1>,<$1>\n\t\t\t<delimiter>$2</delimiter>\n\t\t\t<value>$3</value>\n\t\t</$1>,gis) {
-=======
 	if ($xml =~ s,<(\w+)(\s+[^>]*)delimiter\s*=\s*"(\s[^"]+|[^"]+\s)"([^>]*)>(.*?)</\1>,<$1$2$4>\n\t\t\t<delimiter>$3</delimiter>\n\t\t\t<value>$5</value>\n\t\t</$1>,gis) {
->>>>>>> .merge-right.r290
 		open(XML,"> $file-new") || die "can't create '$file-new': $!";
 		print XML $xml;
 		close(XML);