Make myself not incompetent (Incomplete)

This commit is contained in:
Howard Stark 2018-08-02 23:41:16 -04:00
parent f6f057c8cb
commit 5537954180
No known key found for this signature in database
GPG Key ID: 9FA4E350B33067F3

View File

@ -1,9 +1,6 @@
package baritone.bot.pathing.calc; package baritone.bot.pathing.calc;
<<<<<<< Updated upstream
=======
import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.Movement;
>>>>>>> Stashed changes
import baritone.bot.pathing.goals.Goal; import baritone.bot.pathing.goals.Goal;
import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.Movement;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;