Fixed conflicts - Githubissues

frc1418 / 2015-ui

Team 1418's Driver Station code for 2015. DEPRECATED, use https://github.com/FRCDashboard/FRCDashboard

Apache License 2.0

7 stars 5 forks source link

Closed virtuald closed 9 years ago

virtuald commented 9 years ago

@17mahera this should fix the conflicts, make sure that it has the changes you want.

Once it's been merged, then you will want to:

Delete your 'split' branch
Checkout master
From the command line, do a git reset --hard 92d3213cb3b4ff9eb7c62836d7a1d8f6ea12e0f3
And sync