2021-11-14 13:00:28 +01:00
|
|
|
<!DOCTYPE html>
|
2021-11-14 13:47:14 +01:00
|
|
|
<html lang="pl">
|
2021-11-14 13:00:28 +01:00
|
|
|
<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">
|
|
|
|
|
|
2021-11-14 13:47:14 +01:00
|
|
|
<title>Test v3 (also new name)</title>
|
2021-11-14 13:00:28 +01:00
|
|
|
</head>
|
|
|
|
|
|
|
|
|
|
<body>
|
2021-11-14 13:44:06 +01:00
|
|
|
<hr>
|
|
|
|
|
<p>something new as line 1</p>
|
2021-11-14 13:00:28 +01:00
|
|
|
|
2021-11-14 13:47:14 +01:00
|
|
|
<p>tekst 234 - this is also changed (again), let's hope for a conflict this time</p>
|
2021-11-14 13:44:06 +01:00
|
|
|
|
|
|
|
|
<p>maybe it won't merge automatically....</p>
|
|
|
|
|
<hr>
|
2021-11-14 13:00:28 +01:00
|
|
|
|
|
|
|
|
</body>
|
|
|
|
|
</html>
|
