Compare commits

...

6 Commits
hur ... master

Author SHA1 Message Date
1fca1e8eb4 Merge branch 'accept' of s452490/Homework-CS into master
Accepted.
2020-01-24 12:10:57 +00:00
Jakub Koralewski
5d55ae5f59 Accept this please 2020-01-24 12:56:20 +01:00
Hasan Hür
8322116f4e Two branches were merged and all conflicts have been resolved 2020-01-23 13:16:35 +01:00
Hasan Hür
dfd61d4ea3 Third file was edited 2020-01-23 13:04:55 +01:00
Hasan Hür
a0ef7a9dc7 Some modification has been made 2020-01-23 13:04:15 +01:00
Hasan Hür
ff06bd7616 first file has been modified 2020-01-23 13:01:42 +01:00
4 changed files with 5 additions and 1 deletions

1
accept.txt Normal file
View File

@ -0,0 +1 @@
Accept this though!

View File

@ -1,4 +1,5 @@
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.

View File

@ -1,3 +1,4 @@
this is the second 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 +1,2 @@
This file was changed in branch hur
Third file second line