diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-30 13:17:50 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-30 13:17:50 -0500 |
| commit | 1e1db45c3b5aa8b15da06818023deb1140823a5f (patch) | |
| tree | f2420be6ae36b0919dccf53da331e5c227742c2d /src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java | |
| parent | def1822b3c0236387bf18488de1d02dfa3560c94 (diff) | |
| parent | 26b916b43fdcafd9091e10564e68cc351beb9023 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/org/usfirst/frc/team4272/robot2016/HwRobot.java
# src/org/usfirst/frc/team4272/robot2016/Teleop.java
Diffstat (limited to 'src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java')
| -rw-r--r-- | src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java index 8c54b5f..b5c1d13 100644 --- a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java +++ b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java @@ -34,7 +34,6 @@ package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.GenericHID.Hand; import edu.wpi.first.wpilibj.Joystick; /** |