You are reading a single comment by @Gordon and its replies.
Click here to read the full conversation.
Espruino is a JavaScript interpreter for low-power Microcontrollers. This site is both a support community for Espruino and a place to share what you are working on.
@Gordon
Just a note that it's complaining about some things that don't appear on first glance to have changed - and it seems that whatever editor you used might have changed some 'whitespace' characters, which then confuses the merge