merge conflict resolved

2020-01-29 15:20:01 +01:00 · 2020-01-29 15:20:01 +01:00 · d3dfab1acd
parent 33181684fc 9fc5f3aaf8
commit d3dfab1acd
1 changed files with 1 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -4,8 +4,8 @@
 <title></title>
 </head>
 <body>
-  <h1>Hello World</h1>
  <h2>This is a tag 3</h2>
  <h3>Anohter tag</h3>
+  <h1>This is a tag 1</h1>
 </body>
 </html>