projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 04148f1)
SmartDashboard put D_Val
authorMichael Wang <michaelwang9000@gmail.com>
Sat, 4 Feb 2017 21:40:56 +0000 (13:40 -0800)
committerEric Sandoval <harpnart@gmail.com>
Sun, 19 Feb 2017 18:39:08 +0000 (10:39 -0800)
src/org/usfirst/frc/team3501/robot/Robot.java patch | blob | blame | history

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);