actually fix issues

2021-06-11 23:17:37 -04:00 · 2021-06-11 23:17:37 -04:00 · 05eefc9c45
commit 05eefc9c45
parent c5bf84a8cd
1 changed files with 1 additions and 4 deletions
--- 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;