resolve conflicts

奈可 · 奈可 · commit 6315af9372ef · 2017-05-01T13:30:06.000+08:00
diff --git a/index.html b/index.html
@@ -2,8 +2,8 @@
 <html>
 <body>
 <h1>This is just a test.</h1>
-<p>This is a new line</p>
-<p>Wondeful!</p>
-<p>This is really nice.</p>
+<p style="color: blue">This is a new line</p>
+<p style="color: #9843fc">Wondeful!</p>
+<p>This is really nice</p>
 </body>
 </html>
