From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Tue, 12 Apr 2011 23:16:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
X-Git-Tag: snapshot-20110506-0930~59
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=a6dcf0f3abbe0238c0af5238e2ff7280da4c88da;hp=1cd0c3b6e323a1c9139d772412b542d82ce13b83;p=test%2Ftestrepo.git

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

diff --git a/tucnak.txt b/tucnak.txt
index a5315ae..f3846a9 100644
--- a/tucnak.txt
+++ b/tucnak.txt
@@ -1,4 +1,4 @@
-Uplne novy soubor.
+Mame doma blechu, raz dva tri.
 
 Tučňák je nejlepší. :-)
 Tučnák!!!