Damn, missed one test result.

MapServer · Mar 27, 2018 · 9d3ed9e · 9d3ed9e
1 parent 5d5b125
commit 9d3ed9e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml b/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
@@ -38,11 +38,8 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
       <Format>image/svg+xml</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
-<<<<<<< HEAD
       <Format>application/x-protobuf</Format>
-=======
       <Format>application/json</Format>
->>>>>>> upstream/master
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/?"/></Get>