Solve merge conflict in texturetilesety

This commit is contained in:
Kalle Bladin
2016-05-02 11:44:55 -04:00
18 changed files with 843 additions and 696 deletions
@@ -3,4 +3,11 @@
<ServerUrl>http://198.102.45.23/arcgis/rest/services/worldelevation3d/terrain3d?</ServerUrl>
<TiledGroupName>GCS_Elevation</TiledGroupName>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90.0</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90.0</LowerRightY>
<YOrigin>bottom</YOrigin>
</DataWindow>
</GDAL_WMS>