fix conflicts
authorDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 16:07:34 +0000 (08:07 -0800)
committerDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 16:07:34 +0000 (08:07 -0800)
commiteb9e6bd8da48f0833680f6e6705542bacacd4dd8
treed0756e6b4ea8b615764cf420412d52adfd6712ba
parentde4f822fbfd21dd7421f56b749240e7b11d9bc5c
parentfb376f02820fc8dd8404759e2b45fa582969dc3e
fix conflicts
14 files changed:
.gitignore
src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java
src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java
src/org/usfirst/frc3501/RiceCatRobot/robot/Robot.java
src/org/usfirst/frc3501/RiceCatRobot/robot/RobotMap.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java
src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java