From 6689f0d9bb5bbaa4c2798c054028655f92455c34 Mon Sep 17 00:00:00 2001
From: Fluid1C3 <jalod11@gmail.com>
Date: Tue, 11 Aug 2015 19:26:16 -0500
Subject: [PATCH] gitignore

---
 .gitignore                                | 3 +++
 src/main/java/nmd/primal/energy/Main.java | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a621dec..7342859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ eclipse
 gradle/*
 gradle
 .settings/*
+config
+logs
+eula.txt
diff --git a/src/main/java/nmd/primal/energy/Main.java b/src/main/java/nmd/primal/energy/Main.java
index 9244b48..b53c46d 100644
--- a/src/main/java/nmd/primal/energy/Main.java
+++ b/src/main/java/nmd/primal/energy/Main.java
@@ -25,8 +25,6 @@ public class Main
 		// some example code
         //System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
     }
-<<<<<<< HEAD
-=======
     
 	@EventHandler
 	public void postInit(FMLPostInitializationEvent e) {
@@ -34,7 +32,4 @@ public class Main
 		System.out.println("U want some Body Massage?");
 		//RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, new RenderSnowball(ModItems.itemShit));
 	}
-    
-    //Fluids comment
->>>>>>> 71867cff5f48b73b986b837d8f6e04f57d3ee247
 }