Merge branch 'develop' of https://git.siwatsystem.com/scm/wat/waterishos-revision3.0x into develop
This commit is contained in:
commit
3c810d9b4e
1 changed files with 6 additions and 1 deletions
|
@ -1 +1,6 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
# WaterishOS-Revision3.0x
|
# WaterishOS-Revision3.0x
|
||||||
|
=======
|
||||||
|
# WaterishOS-Revision2.0x
|
||||||
|
This is Waterish OS Revision 2 for Board v2 based on esp8266
|
||||||
|
>>>>>>> 4ea1442f6cc3a60cf380eb9710072af0624eefff
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue