SmartDashboard put D_Val

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 041097e490f3e5dccc574cac9d8b4757f8717ef7..8829ed1a2f9c26089c70fc8a7d53d3a488c7ba1d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -44,7 +44,6 @@ 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);