projects
/
3501
/
2015-FRC-Spark
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix conflicts
[3501/2015-FRC-Spark]
/
src
/
org
/
usfirst
/
frc3501
/
RiceCatRobot
/
subsystems
/
Arm.java
diff --git
a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
index 8d78c8f48e9e8ccac467c6617c1cc3368cb38eba..e20a822938fa2a66c26bd39bebfed9b74d3fb013 100644
(file)
--- a/
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
+++ b/
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
@@
-1,6
+1,6
@@
package org.usfirst.frc3501.RiceCatRobot.subsystems;
-import org.usfirst.frc3501.RiceCatRobot.RobotMap;
+import org.usfirst.frc3501.RiceCatRobot.
robot.
RobotMap;
import edu.wpi.first.wpilibj.CANJaguar;
import edu.wpi.first.wpilibj.command.Subsystem;