fix up some merge weirdness

diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx
index 1518b13306a2f3b58070c7cf6d3c631c682b2ce5..1e16629e8a3f43bdc7dfef9037103ec44338e80c 100644 (file)
--- a/simgear/scene/sky/newcloud.cxx
+++ b/simgear/scene/sky/newcloud.cxx
@@ -69,7 +69,6 @@ EffectMap effectMap;
 
 double SGNewCloud::sprite_density = 1.0;
 
-
 SGNewCloud::SGNewCloud(string type,
                        const SGPath &tex_path, 
                        string tex,
@@ -222,7 +221,7 @@ osg::ref_ptr<EffectGeode> SGNewCloud::genCloud() {
             z = height * cos(elev) * 0.5f; 
         }
         
-        // Determine the height and width as scaling factors on the minimum size (used to create the quad)
+        // Determine the height and width as scaling factors on the minimum size (used to create the quad).
         float sprite_width = 1.0f + sg_random() * (max_sprite_width - min_sprite_width) / min_sprite_width;
         float sprite_height = 1.0f + sg_random() * (max_sprite_height - min_sprite_height) / min_sprite_height;