Update index.html

Why1221 · Apr 8, 2021 · b0941cb · b0941cb
1 parent b73b89f
commit b0941cb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!-- <!doctype html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8">
@@ -29,6 +29,7 @@ <h1 class="name">  Huayi (Harry) Wang </h1>
   </div>
   </body>
 </html>
+<<<<<<< HEAD
  -->
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="html5">
@@ -215,3 +216,5 @@ <h1 class="name">  Huayi (Harry) Wang </h1>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
   </body>
 </html>
+=======
+>>>>>>> parent of f2a42b2 (Update index.html)