Make myself not incompetent (Incomplete)

2018-08-02 23:41:16 -04:00
parent f6f057c8cb
commit 5537954180
1 changed files with 0 additions and 3 deletions
--- 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;