From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 14 Apr 2011 14:20:43 +0000 (+0200)
Subject: Nekonfliktni zmena
X-Git-Tag: snapshot-20110506-0930~54
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=54678d0b224d5a1c12d792bcedbccccfe46144c3;p=test%2Ftestrepo.git

Nekonfliktni zmena
---

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 967af95..bd4f4b5 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,4 +1,3 @@
-Blabol
 jezek
 tucnak