From 5298d9be19a100bf4eb006f6ba716b089099d459 Mon Sep 17 00:00:00 2001 From: Barbara Skalik Date: Sun, 14 Nov 2021 13:44:06 +0100 Subject: [PATCH 1/2] Some minor changes --- file.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/file.html b/file.html index 2afaa21..ac4d75d 100644 --- a/file.html +++ b/file.html @@ -1,17 +1,21 @@ - + - Test + Test v2 (also new name) +
+

something new as line 1

-

tekst 1

-

tekst 2

+

tekst 234 - this is also changed

+ +

maybe it won't merge automatically....

+
\ No newline at end of file From e0c5a7c1dffeb3026ed66f06b2339b69704f7515 Mon Sep 17 00:00:00 2001 From: Barbara Skalik Date: Sun, 14 Nov 2021 13:47:14 +0100 Subject: [PATCH 2/2] Zaktualizuj 'file.html' --- file.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file.html b/file.html index ac4d75d..b132ed6 100644 --- a/file.html +++ b/file.html @@ -1,18 +1,18 @@ - + - Test v2 (also new name) + Test v3 (also new name)

something new as line 1

-

tekst 234 - this is also changed

+

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

maybe it won't merge automatically....