Fix conflicts

This commit is contained in:
Quentin Guidée
2020-02-26 22:17:57 +01:00
19 changed files with 190 additions and 113 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
/output/
/build/artifacts/
build/device/**/*.pyc
epsilon.elf
.vscode