Skip to content

G
git_test
Commit 7d4cee1d authored by Нұрасыл Қайратұлы's avatar Нұрасыл Қайратұлы
Browse files
Options

fix conflict

parents 0743076d ed93f706
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
index.html → main.html
View file @ 7d4cee1d
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<title>Document</title> <title>Document</title>
</head> </head>
<body> <body>
<h1>Hello world</h1>
<header> <header>
<nav><a href=""></a><a href=""></a><a href=""></a></nav> <nav><a href=""></a><a href=""></a><a href=""></a></nav>
</header> </header>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment