From 94d3d21f47b9b9fa9fd460c0025861b4b3e4dad2 Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Thu, 14 Apr 2011 16:34:40 +0200
Subject: [PATCH] Konfliktni zmena

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

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