merge conflicts

This commit is contained in:
Silver Kuusik
2018-01-10 22:12:50 +01:00
3 changed files with 35 additions and 1 deletions

3
.gitignore vendored
View File

@@ -1 +1,2 @@
esp32*
# ignore the ESP32 MicroPython binary
esp32*.bin