This is a homework.

Jakub Koralewski 5d55ae5f59 Accept this please		2020-01-24 12:56:20 +01:00
accept.txt	Accept this please	2020-01-24 12:56:20 +01:00
empty.txt	An empty file was created	2020-01-20 15:12:24 +01:00
first.txt	Two branches were merged and all conflicts have been resolved	2020-01-23 13:16:35 +01:00
second.txt	Two branches were merged and all conflicts have been resolved	2020-01-23 13:16:35 +01:00
third.txt	Two branches were merged and all conflicts have been resolved	2020-01-23 13:16:35 +01:00