HexAirbot/HexNanoController_Android

Merge conflicts merged into master?

atiti opened this issue · 0 comments

atiti commented

I'll be honest, I haven't tried to build the project yet, but just started browsing the code base, and I've seen a bunch of merge conflicts were merged with this commit:

33f79a6