This commit is contained in:
Mikołaj Stodolny 2017-11-18 15:57:26 +01:00
parent fe4ea9c240
commit d218060fc5

6
test
View File

@ -1,9 +1,7 @@
abc abc
nowa linia nowa linia
<<<<<<< HEAD
1235 1235
87654 87654
=======
to jest kolejna linia do dodania to jest kolejna linia do dodania
>>>>>>> 6ec80f589cc40981565228be3cbb234349595387 no i nowe coś... i nowe