From 3f425c980f3f30493212f4732282062571de77f3 Mon Sep 17 00:00:00 2001
From: Li-YangZhong <45118543+Li-YangZhong@users.noreply.github.com>
Date: Sun, 1 Sep 2019 14:19:05 +0800
Subject: [PATCH 1/2] added content for branch feature2

---
 index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/index.html b/index.html
index 8d79e05..e881cf6 100644
--- a/index.html
+++ b/index.html
@@ -21,5 +21,7 @@
 =======
     <p>hello</p>
 >>>>>>> master
+
+<span>contents added for branch feature2</span>
 </body>
 </html>
\ No newline at end of file

From 0e8d8b40748b1e676db1d0374cef352fb990664d Mon Sep 17 00:00:00 2001
From: Li-YangZhong <45118543+Li-YangZhong@users.noreply.github.com>
Date: Sun, 1 Sep 2019 14:27:10 +0800
Subject: [PATCH 2/2] merge feature2

---
 index.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/index.html b/index.html
index e881cf6..5a121e8 100644
--- a/index.html
+++ b/index.html
@@ -13,14 +13,6 @@
             <li>sand</li>
         </ul>
     </div>
-<<<<<<< HEAD
-
-    <module-two>
-        <div>my awesome new module about news</div>
-    </module-two>
-=======
-    <p>hello</p>
->>>>>>> master
 
 <span>contents added for branch feature2</span>
 </body>