1
0

Two branches were merged and all conflicts have been resolved

This commit is contained in:
Hasan Hür 2020-01-23 13:16:35 +01:00
commit 8322116f4e
3 changed files with 5 additions and 1 deletions

View File

@ -1,3 +1,5 @@
this is the very first file this is the very first file
this line was added later. this line was added later.
branch hur third line
branch hur fourth line
This is a sentence appended in branch master. This is a sentence appended in branch master.

View File

@ -1,2 +1,4 @@
this is the second file this is the second file
This is the second line of this text file. This is the second line of this text file.
and this line was added in branch hur
this is the last line added in branch hur

View File

@ -1,2 +1,2 @@
This is another file This file was changed in branch hur
Third file second line Third file second line