Solve merge conflict from previous filter.

data/scene/debugglobe/debugglobe.mod

@@ -55,6 +55,7 @@ return {
                         Name = "MODIS_Terra_CorrectedReflectance_TrueColor",
                         FilePath = "map_service_configs/earth/MODIS_Terra_CorrectedReflectance_TrueColor.xml",
                     },]]
+
                     {
                         Name = "ESRI Imagery World 2D",
                         FilePath = "map_service_configs/earth/ESRI_Imagery_World_2D.wms",

modules/globebrowsing/shaders/texturetilemapping.hglsl

@@ -282,7 +282,6 @@ vec4 calculateGrayScaleOverlay(
 	vec3 hsvCurrent = rgb2hsv(currentColor.rgb);
 	vec3 hsvNew = vec3(hsvCurrent.x, hsvCurrent.y, colorGrayScale.r);
 	vec3 rgbNew = hsv2rgb(hsvNew);
-	
 
 	// HSL blending
 	vec3 hslCurrent = rgb2hsl(currentColor.rgb);

modules/globebrowsing/tile/tiledataset.cpp

@@ -425,7 +425,6 @@ namespace openspace {
         return geodetic;
     }
 
-
     IODescription TileDataset::getIODescription(const ChunkIndex& chunkIndex) const {
         IODescription io;
         io.read.region = gdalPixelRegion(chunkIndex);
@@ -680,7 +679,7 @@ namespace openspace {
 
     CPLErr TileDataset::postProcessErrorCheck(std::shared_ptr<const TileIOResult> result, const IODescription& io) const{
         int success;
-        
+
         double missingDataValue = gdalRasterBand(io.read.overview)->GetNoDataValue(&success);
         if (!success) {
             missingDataValue = 32767; // missing data value for TERRAIN.wms. Should be specified in xml