Closed cswelch closed 9 years ago
Why are you merging code from swerve_common?
You should be putting your code in ftc_6220
Closing this pull request as it is likely erroneous in nature.
Teams should do pull requests from their team branch in their fork to their team branch in the swerve fork. For example: merge from blah151/ftc_6220 to swerve/ftc_6220.
Team-specific code should not go in swerve_common.
Here is the updated and merged TeleOp and autonomous for 6220.