mirror of
https://github.com/anklimov/lighthub
synced 2025-12-06 19:59:50 +03:00
Merge branch 'develop' of https://github.com/anklimov/lighthub into develop
This commit is contained in:
@@ -1 +1,5 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
||||||
|
=======
|
||||||
|
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
||||||
|
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76
|
||||||
|
|||||||
@@ -1 +1,5 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
||||||
|
=======
|
||||||
|
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
|
||||||
|
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76
|
||||||
|
|||||||
Reference in New Issue
Block a user