Compare commits

..

No commits in common. "z1" and "9f11e656130ebd6734e677a29fdcac719abc061b" have entirely different histories.

3 changed files with 3 additions and 4 deletions

3
trymerging Normal file
View File

@ -0,0 +1,3 @@
branch master zmiana1
zmiana na branchie1
ja to wszystko robil z komendy echo, i >> zeby nowy tekst byl nizej i robil konfliktu

2
z1
View File

@ -1,2 +0,0 @@
napisz date dzisejsza
b jaki kolwiek smajl

2
zad1
View File

@ -1,2 +0,0 @@
napisz dzis. date
i Hello world