From 75abce905d28192ec1ad049945b160f2b64fee4a Mon Sep 17 00:00:00 2001
From: Tycho Bickerstaff <work.tycho@gmail.com>
Date: Sun, 22 Dec 2013 16:33:40 +0000
Subject: fixed bad merge

---
 src/Chunk.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 34cb6a534..fb26e983d 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -2900,10 +2900,6 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const
 
 
 
-#if !C_CHUNK_USE_INLINE
-# include "cChunk.inl.h"
-#endif
-
 
 
 
-- 
cgit v1.2.3