siwat
/
waterish_os_rev3_public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://git.siwatsystem.com/scm/wat/waterishos-revision3.0x into develop

This commit is contained in:
Siwat Sirichai 2019-09-04 23:32:48 +07:00
parent 1ab2c925c4 4f2976401b
commit d034152c8a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,6 +1,2 @@
<<<<<<< HEAD
# WaterishOS-Revision3.0x
=======
# WaterishOS-Revision2.0x # WaterishOS-Revision2.0x
This is Waterish OS Revision 2 for Board v2 based on esp8266 This is Waterish OS Revision 2 for Board v2 based on esp8266
>>>>>>> 4ea1442f6cc3a60cf380eb9710072af0624eefff