search

cornell-cup / cs-minibot

[WIP] Software platform for MiniBot, an educational robotics kit made for Da Vinci Labs.
http://cornellcuprobotics.com/projects.html#minibot
Apache License 2.0
5 stars 1 forks source link

New Blockly Update #68

Closed jzhu2017 closed 7 years ago

jzhu2017 commented 7 years ago

Blockly update with categories, loading function, new blocks.

leotrj commented 7 years ago

It says there is merge conflict? Have you tried git checkout -b develop git pull git checkout [your branch name] git rebase develop?

If that doesn't work you could just git merge develop and fix merge conflict. Make sure you always resolve merge conflict before you make a pull request.

Kairi700 commented 7 years ago

Those are old, forgot to delete them. Just pushed this change and deleted package-lock.json again.