From 04148f122c38acb34147612d59baecd9f0f5cc26 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sat, 4 Feb 2017 13:43:04 -0800 Subject: [PATCH] hope fix --- src/org/usfirst/frc/team3501/robot/Robot.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 8829ed1..041097e 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -44,6 +44,7 @@ public class Robot extends IterativeRobot { public void autonomousInit() { driveTrain.setHighGear(); +<<<<<<< 7361ba4ac28673251bd93f8a926927ca81a1eec6 SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_P_Val, 0); SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_I_Val, 0); SmartDashboard.putNumber(Constants.DriveTrain.DRIVE_D_Val, 0); -- 2.30.2