This commit is contained in:
Marcin Marlewski 2021-11-14 14:14:27 +01:00
parent 86691c4320
commit bb4a22223b

View File

@ -1,21 +1,16 @@
<!DOCTYPE html>
<html lang="pl">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Test v3 (also new name)</title>
</head>
<body>
<hr>
<p>something new as line 1</p>
<p>tekst 234 - this is also changed (again), let's hope for a conflict this time</p>
<p>maybe it won't merge automatically....</p>
<hr>
</body>
<!DOCTYPE html>
<html lang="pl">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Test</title>
</head>
<body>
<p>$$$$$$</p>
</body>
</html>