From 5537954180209d2f99517b3c9b994c101c604a71 Mon Sep 17 00:00:00 2001
From: Howard Stark <howard@getcoffee.io>
Date: Thu, 2 Aug 2018 23:41:16 -0400
Subject: [PATCH] Make myself not incompetent (Incomplete)

---
 src/main/java/baritone/bot/pathing/calc/Path.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/baritone/bot/pathing/calc/Path.java b/src/main/java/baritone/bot/pathing/calc/Path.java
index 20a0aeac..e13dac25 100644
--- a/src/main/java/baritone/bot/pathing/calc/Path.java
+++ b/src/main/java/baritone/bot/pathing/calc/Path.java
@@ -1,9 +1,6 @@
 package baritone.bot.pathing.calc;
 
-<<<<<<< Updated upstream
-=======
 import baritone.bot.pathing.movement.Movement;
->>>>>>> Stashed changes
 import baritone.bot.pathing.goals.Goal;
 import baritone.bot.pathing.movement.Movement;
 import net.minecraft.util.math.BlockPos;