]> www.fi.muni.cz Git - test/testrepo.git/blobdiff - zizala.txt
Merge branch 'sdilena_vetev' of ../testrepo into sdilena_vetev2
[test/testrepo.git] / zizala.txt
index 4ca0135f3e71c74aa4ef5987c351786fabacb91f..86215663495abd0d28a918db44efe0c835950790 100644 (file)
@@ -1,3 +1,4 @@
+roura
 trubka
 zizala
 zizala
@@ -10,3 +11,4 @@ zizalka 4928
 zizalka 11199
 ziiiizala
 zizalka 11199
+zizala 42