From 7e43e56837a1554dbedadc45c37fb996d919e100 Mon Sep 17 00:00:00 2001
From: Fenn <pokefenn@googlemail.com>
Date: Sat, 28 Jun 2014 18:30:36 +0100
Subject: [PATCH] Removed derp.

---
 .../jbcs/minecraft/chisel/carving/CarvableHelper.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
index d839856c..b14dbc22 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
@@ -419,16 +419,6 @@ public class CarvableHelper
     {
         for(CarvableVariation variation : variations)
         {
-<<<<<<< HEAD
-            if(variation.blockName.contains("sandstone"))
-                System.out.println(variation.description);
-
-            if(variation.metadata == 1)
-            {
-                //    System.out.println(variation.description);
-            }
-=======
->>>>>>> origin/master
             list.add(new ItemStack(block, 1, variation.metadata));
         }
     }