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

Konfliktni zmena
---

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 8ba676a..3d4c866 100644
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1 +1 @@
-krtek
+krtek16241