[mapserver-commits] r11410 - tags/rel-6-0-0-beta4/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-03-30 18:24:43 -0700 (Wed, 30 Mar 2011)
New Revision: 11410

Modified:
   tags/rel-6-0-0-beta4/mapserver/HISTORY.TXT
Log:
Remove stray SVN conflict delimiter

Modified: tags/rel-6-0-0-beta4/mapserver/HISTORY.TXT
===================================================================
--- tags/rel-6-0-0-beta4/mapserver/HISTORY.TXT	2011-03-31 01:23:14 UTC (rev 11409)
+++ tags/rel-6-0-0-beta4/mapserver/HISTORY.TXT	2011-03-31 01:24:43 UTC (rev 11410)
@@ -91,7 +91,6 @@
 
 - SLD: Text Symbolizer now uses the new expression syntax (#3757)
 
->>>>>>> .r11395
 - WFS: correct bbox values for GetFeature with featureid request (#3761) 
 
 - Mapscript Seg Fault on mapObj->getMetaData (#3738)