diff --git a/file.html b/file.html index b132ed6..bac7eaf 100644 --- a/file.html +++ b/file.html @@ -15,6 +15,8 @@

tekst 234 - this is also changed (again), let's hope for a conflict this time

maybe it won't merge automatically....

+ +

bla bla