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

Blabol
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 5c685e4..6b9fd0d 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,3 +1,5 @@
+Blabol
+
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.