mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-14 19:59:53 +03:00
Merged changes for the new dev
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -6,4 +6,9 @@
|
||||
platformio.ini
|
||||
lib/readme.txt
|
||||
.travis.yml
|
||||
<<<<<<< HEAD
|
||||
*.py
|
||||
=======
|
||||
stackdmp.txt
|
||||
*.jar
|
||||
>>>>>>> upstream/dev
|
||||
|
||||
Reference in New Issue
Block a user