From e57b9b0c8fa076cfdd61407fa5b32ddfbe5c63a8 Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Wed, 6 Apr 2011 14:18:26 +0200
Subject: [PATCH] Zkousim konflikt.

---
 lorem_ipsum.txt | 1 +
 1 file changed, 1 insertion(+)

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.
 
-- 
2.43.0