This commit is contained in:
Maciej Kania 2017-11-18 15:53:22 +01:00
commit fe4ea9c240

5
test
View File

@ -1,4 +1,9 @@
abc
nowa linia
<<<<<<< HEAD
1235
87654
=======
to jest kolejna linia do dodania
>>>>>>> 6ec80f589cc40981565228be3cbb234349595387