From 5a3ab0e1001241d995ebe1ef6569660f297a1911 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@albireo.ucw.cz>
Date: Thu, 9 Feb 2006 15:15:06 +0100
Subject: [PATCH 1/1] playing

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 36fe770..293cd06 100644
--- a/README
+++ b/README
@@ -1,2 +1,2 @@
 This is a completely unimportant file.
-Resolved version.
+Resolved version. Again trying to make a conflict.
-- 
2.39.2