From 5b2770bdc009f6219a38fa7e81d30cec87469e1b Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Fri, 15 Apr 2011 09:04:15 +0200
Subject: [PATCH] konflikt

---
 subdir/soubor_v_podadresari | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.39.3