fix merge conflicts position-aware-autonomous
authorDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 18:34:54 +0000 (10:34 -0800)
committerDavid <david.dobervich@gmail.com>
Fri, 20 Nov 2015 18:34:54 +0000 (10:34 -0800)
commit9c7b88fb3fa3318bc86e4c4e9392a8943bdcf803
treee8a6b86a0d44540afae12010bc9e45ef30a0a080
parentaa9c330eeadb1ab6b945c8d14b9a920ae7732cf7
parentc7a54f8e92507c36aeefbd99783e0811402b34b5
fix merge 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