1 changed files with 2 additions and 0 deletions
--- a/file.html
+++ b/file.html
@ -15,6 +15,8 @@
  <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>
+
+  <p>bla bla</p>
  <hr>

 </body>