mirror of
https://github.com/UtilitechAS/amsreader-firmware.git
synced 2026-01-18 17:26:46 +00:00
Merge remote-tracking branch 'gskjold/master' into develop
Conflicts: .gitignore Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino Arduino Code/Arduino Libraries/HanReader/src/Aidon.h
This commit is contained in:
commit
cd02d19722
4
.gitignore
vendored
4
.gitignore
vendored
@ -3,5 +3,7 @@
|
||||
[Rr]elease/
|
||||
**/__vm/
|
||||
.DS_Store
|
||||
|
||||
*.sw[op]
|
||||
.vscode
|
||||
.pio
|
||||
platformio.ini
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user