search

Team612 / 612-2016

FRC Team 612's 2016 code for First Stronghold
GNU General Public License v2.0
9 stars 6 forks source link

Dev-controls #117

Closed DavidFiumano closed 8 years ago

DavidFiumano commented 8 years ago

Pull for semi-finished control scheme (waiting on one command to be finished by on another branch).

Mister-G-Lu commented 8 years ago

as you can see there are clearly conflicts. Resolve 'em and then try to pull.