From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Mon, 4 Apr 2011 15:36:05 +0000 (+0200)
Subject: put lorem_ipsum.txt
X-Git-Tag: snapshot-20110506-0930~92
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=test%2Ftestrepo.git;a=commitdiff_plain;h=39e0bb03d7f656b2311537c765da738efa716e85

put lorem_ipsum.txt
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 1bcc9e0..6d393b9 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,6 +1,8 @@
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
+Nejaka zmena.
+
 1# Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod
 1# tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 1# quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi