From 8301f479bba4c12579d56c2274b85033a336057c Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 27 Mar 2014 23:21:04 +0100
Subject: Fix merge conflicts

---
 src/ChunkMap.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index da5dd90e4..e695f0ab2 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1384,13 +1384,6 @@ void cChunkMap::ReplaceTreeBlocks(const sSetBlockVector & a_Blocks)
 				}
 				break;
 			}
-			case E_BLOCK_NEW_LEAVES:
-			{
-				if (itr->BlockType == E_BLOCK_NEW_LOG)
-				{
-					Chunk->SetBlock(itr->x, itr->y, itr->z, itr->BlockType, itr->BlockMeta);
-				}
-			}
 		}
 	}  // for itr - a_Blocks[]
 }
-- 
cgit v1.2.3