From: Daniel Navratil <xnavrat1@fi.muni.cz>
Date: Mon, 11 Apr 2011 08:36:40 +0000 (+0200)
Subject: Pridan druhy blabol :-)
X-Git-Tag: snapshot-20110506-0930~59^2~7
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=cb56da9797a6f996821e3b07dd654f9d4c1cde85;p=test%2Ftestrepo.git

Pridan druhy blabol :-)
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 6b9fd0d..523e335 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,5 +1,7 @@
 Blabol
 
+Druhy blabol :-) :-O :-)
+
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.