From 05eefc9c457ebf41fd4a35208d3bf6d4dd37f202 Mon Sep 17 00:00:00 2001
From: austin <austin@austinwhoover.com>
Date: Fri, 11 Jun 2021 23:17:37 -0400
Subject: [PATCH] actually fix issues

---
 src/main/java/electrosphere/renderer/RenderUtils.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/electrosphere/renderer/RenderUtils.java b/src/main/java/electrosphere/renderer/RenderUtils.java
index 4f44df26..59ba99ec 100644
--- a/src/main/java/electrosphere/renderer/RenderUtils.java
+++ b/src/main/java/electrosphere/renderer/RenderUtils.java
@@ -674,10 +674,7 @@ public class RenderUtils {
 //                    currentModel.draw();
 //                }
         }
-<<<<<<< HEAD
-=======
-        boolean renderHitboxes = false;
->>>>>>> 1f90094761262a9a137f96e246d1fbd70437a8b8
+        
         if(renderHitboxes){
             for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
                 Model hitboxModel;