Abort fix and a binary file update

ideaHex / FHTbot

Firmware for Makerfaire robot

Apache License 2.0

10 stars 7 forks source link

Abort fix and a binary file update #46

Closed Rodinga closed 8 years ago

Rodinga commented 8 years ago

This fixes the abort problem by creating a separate xhttp object for heartbeat's use. All the binary files have been regenerated and committed. I've merged in all your changes so it should merge back in automatically without any issue.

TildenG commented 8 years ago

Whats with all the extra files ?????

I just done a quick count I have 87 which includes a few extras from your prior builds, your current pull request has 147 ???

TildenG commented 8 years ago

It shows conflicts, did you merge the files after I fixes the path is blocklyBall ?

Conflicting files data/T/js/blocklyBall.js data/T/js/blocklyBall.js.gz

Rodinga commented 8 years ago

Cleaned up master branch on my repo and removed extra files which had survived purge in data/T. Will close this request and submit an new one.