s125935/WSI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

Browse Source
This commit is contained in:
Maciej Kania 2017-11-18 15:55:30 +01:00
parent fe4ea9c240
commit 67f82cc57a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test
View File

@ -1,9 +1,4 @@
abc
nowa linia nowa linia
<<<<<<< HEAD
1235 1235
87654
======= I'm a freakin hacker!!
to jest kolejna linia do dodania
>>>>>>> 6ec80f589cc40981565228be3cbb234349595387