test
testowe pliki
karty
b
b
Merge branch 'test-branch' of https://github.com/atoato/test-repository into test-branch
c
ps
Merge branch 'test-branch' of https://github.com/atoato/test-repository into test-branch
b1
Merge branch 'test-branch' of https://github.com/atoato/test-repository into test-branch
e
f
b3
b2
Merge branch 'test-branch' of https://github.com/atoato/test-repository into test-branch

Conflicts:
	folder1/text1.txt
text2
Aktualizacja bazy kart: test
Aktualizacja bazy kart: test
Aktualizacja bazy kart: test