From cadc07c63d147a087c7af61ba59af71d82a08307 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 8 May 2013 18:07:33 -0700
Subject: [PATCH] merge conflict fix

---
 voxel-edit/src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/voxel-edit/src/main.cpp b/voxel-edit/src/main.cpp
index 6e193315e1..222bf3f15b 100644
--- a/voxel-edit/src/main.cpp
+++ b/voxel-edit/src/main.cpp
@@ -24,7 +24,7 @@ void addLandscape(VoxelTree * tree) {
     printf("Adding Landscape...\n");
 }
 
-void addScene(VoxelTree * tree) {
+void voxelTutorial(VoxelTree * tree) {
     printf("adding scene...\n");
 
     // We want our corner voxels to be about 1/2 meter high, and our TREE_SCALE is in meters, so...