Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo

diff --git a/subdir/jezek b/subdir/jezek
index 8480e470f2436a6749a30242ec5683208ff756fe..db8a44cd3986b07fe14bc7684da1cf80cb77e77a 100644 (file)
--- a/subdir/jezek
+++ b/subdir/jezek
@@ -1,2 +1,3 @@
 jezek
 dalsi jezek
+spousty jezku

diff --git a/tux3.txt b/tux3.txt
new file mode 100644 (file)
index 0000000..5df0c70
--- /dev/null
+++ b/tux3.txt
@@ -0,0 +1 @@
+Třetí tučňák.