retrospy / RetroSpy

Live controller viewer for Nintendo consoles as well as many other retro consoles and computers. Includes viewer application for Windows, and Arduino sketch for hardware interface.
https://retro-spy.com
GNU General Public License v3.0
143 stars 22 forks source link

Merge conflict detected #144

Closed zoggins closed 4 years ago

zoggins commented 4 years ago

Hey, I'm really sorry about this, but there was a merge conflict when I tried to auto-sync the last time, from 4a3726053dff39f6f8ccaa9b23a24a696eaa84f8:

Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

You'll have to resolve this problem manually, I'm afraid. I'm so sorry

/cc @zoggins