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

Konfliktni zmena
---

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 9c5b182..8ba676a 100644
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1,3 +1 @@
-Nejaky soubor
-neco
-neco
+krtek