From 4f2976401b28170cd61538686bf79899b894e7a5 Mon Sep 17 00:00:00 2001
From: Siwat Sirichai <siwat@siwatinc.com>
Date: Wed, 4 Sep 2019 16:32:06 +0000
Subject: [PATCH] Update README.md

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 49f5a96..6544188 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-# WaterishOS-Revision3.0x
-=======
 # WaterishOS-Revision2.0x
-    This is Waterish OS Revision 2 for Board v2 based on esp8266
->>>>>>> 4ea1442f6cc3a60cf380eb9710072af0624eefff
+    This is Waterish OS Revision 2 for Board v2 based on esp8266
\ No newline at end of file