From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Wed, 6 Apr 2011 12:18:26 +0000 (+0200)
Subject: Zkousim konflikt.
X-Git-Tag: snapshot-20110506-0930~62
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=e57b9b0c8fa076cfdd61407fa5b32ddfbe5c63a8;p=test%2Ftestrepo.git

Zkousim konflikt.
---

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