2017-11-18 15:43:53 +01:00
|
|
|
abc
|
2017-11-18 15:48:27 +01:00
|
|
|
nowa linia
|
2017-11-18 15:53:22 +01:00
|
|
|
<<<<<<< HEAD
|
2017-11-18 15:51:33 +01:00
|
|
|
1235
|
2017-11-18 15:53:22 +01:00
|
|
|
87654
|
2017-11-18 15:51:33 +01:00
|
|
|
|
2017-11-18 15:53:22 +01:00
|
|
|
=======
|
2017-11-18 15:50:54 +01:00
|
|
|
to jest kolejna linia do dodania
|
2017-11-18 15:53:22 +01:00
|
|
|
>>>>>>> 6ec80f589cc40981565228be3cbb234349595387
|
