diff --git a/trymerging b/trymerging index 6c89753..591f5e6 100644 --- a/trymerging +++ b/trymerging @@ -1,2 +1,3 @@ branch master zmiana1 zmiana na branchie1 +ja to wszystko robil z komendy echo, i >> zeby nowy tekst byl nizej i robil konfliktu