From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Fri, 15 Apr 2011 07:04:15 +0000 (+0200)
Subject: konflikt
X-Git-Tag: snapshot-20110506-0930~40
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=test%2Ftestrepo.git;a=commitdiff_plain;h=5b2770bdc009f6219a38fa7e81d30cec87469e1b

konflikt
---

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 55c11af..5819aba 100644
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1 +1,2 @@
 jezek
+jezek