Solve merge conflicts.

openspace.cfg

@@ -7,7 +7,14 @@ return {
 
     -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description
     -- of all entities that will be visible during an instance of OpenSpace
-	Scene = "${SCENE}/globebrowsing.scene",
+
+    -- Scene = "${SCENE}/default_nh.scene",
+    -- Scene = "${SCENE}/default.scene",
+       Scene = "${SCENE}/globebrowsing.scene",
+    -- Scene = "${SCENE}/default-modified.scene",
+    -- Scene = "${SCENE}/rosetta.scene",
+    -- Scene = "${SCENE}/dawn.scene",
+    -- Scene = "${SCENE}/newhorizons.scene",
 
     Paths = {
         SGCT = "${BASE_PATH}/config/sgct",
@@ -47,6 +54,7 @@ return {
         File = "${BASE_PATH}/Properties.txt"
     },
     DownloadRequestURL = "http://openspace.itn.liu.se/request.cgi",
+    RenderingMethod = "Framebuffer"
     --RenderingMethod = "ABuffer" -- alternative: "Framebuffer"
 
 }