search

LakeEffectRobotics / LER_2019

2019 Destination Deep Space
Apache License 2.0
0 stars 0 forks source link

want to update from develop #20

Closed gbuckholtz closed 5 years ago

gbuckholtz commented 5 years ago

let's see if I got it right

emka725 commented 5 years ago

Just cleaned up the remaining merge conflicts. emka725 now contains both the "spark" declarations and ShawnDrive.

gbuckholtz commented 5 years ago

@emka725 I think that your branch is up to date with the develop branch. (max->spark) and the merge conflict with ShawnDrive. We just need to try the emka725 branch on the robot to see if it works like we expect.