[mapserver-commits] r11408 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-03-30 18:20:35 -0700 (Wed, 30 Mar 2011)
New Revision: 11408

Modified:
   trunk/mapserver/HISTORY.TXT
Log:
Remove stray SVN conflict delimiter

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-31 01:12:43 UTC (rev 11407)
+++ trunk/mapserver/HISTORY.TXT	2011-03-31 01:20:35 UTC (rev 11408)
@@ -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)