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

put lorem_ipsum.txt
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index d8e0ef0..5c685e4 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,8 +1,6 @@
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
-A jeste dalsi 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