search

Team612 / 612-2015

FRC team 612's repository for 2015 season
GNU General Public License v2.0
4 stars 6 forks source link

Fixing powerboard compilation issues #100

Closed WardBenjamin closed 9 years ago

WardBenjamin commented 9 years ago

Who's fault was this? Git blame says it's Not Zack. Please don't push to master directly, and ensure that all code compiles before committing @ZachPerkins1.

WardBenjamin commented 9 years ago

Merge conflict fix'd.

WardBenjamin commented 9 years ago

Note: although the log shows this very oddly, the PowerBoard::InitDefaultCommand() function still exists, though the second duplicate copy that was stopping compile has been removed.