]> www.fi.muni.cz Git - test/testrepo.git/commitdiff
https://www.fi.muni.cz/~kas/git / test / testrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 932fa2e)
Merge branch 'sdilena_vetev' of ../testrepo into sdilena_vetev2
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:18:19 +0000 (14:18 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Tue, 24 Jan 2012 13:18:19 +0000 (14:18 +0100)
zizala.txt patch | blob | history

diff --git a/zizala.txt b/zizala.txt
index fc124382e86e6afa2c952366f8c94ef6c085380a..86215663495abd0d28a918db44efe0c835950790 100644 (file)
--- a/zizala.txt
+++ b/zizala.txt
@@ -1,3 +1,4 @@
+roura
 trubka
 zizala
 zizala
Testovaci repozitar