From: Daniel Jakubik <xjakubik@akis.fi.muni.cz>
Date: Wed, 6 Apr 2011 14:19:01 +0000 (+0200)
Subject: Test na rozkopirovani
X-Git-Tag: snapshot-20110506-0930~60^2~2^2~2
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=test%2Ftestrepo.git;a=commitdiff_plain;h=b40ba1f4e76dc6878e3194522732d4cb47493b67

Test na rozkopirovani
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index f8943aa..bd2968c 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,3 +1,5 @@
+ds;kaf;slkdf;ask;falskf;dkas
+
 YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.