From: Martin Mares <mj@albireo.ucw.cz>
Date: Thu, 9 Feb 2006 14:15:06 +0000 (+0100)
Subject: playing
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=5a3ab0e1001241d995ebe1ef6569660f297a1911;hp=8e7ba85c5fcea349e9bff64f03a4c7dfc9761366;p=vcut.git

playing
---

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.