WSI/test
Maciej Kania fe4ea9c240 test
2017-11-18 15:53:22 +01:00

10 lines
130 B
Plaintext

abc
nowa linia
<<<<<<< HEAD
1235
87654
=======
to jest kolejna linia do dodania
>>>>>>> 6ec80f589cc40981565228be3cbb234349595387