merge conflict resolved

This commit is contained in:
Reinard van Dalen 2020-01-29 15:20:01 +01:00
commit d3dfab1acd
1 changed files with 1 additions and 1 deletions

View File

@ -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>