From: Martin Mares <mj@albireo.ucw.cz>
Date: Thu, 9 Feb 2006 14:15:51 +0000 (+0100)
Subject: Merge branch 'master' of cvs.ucw.cz:/home/mj/GIT/vcut
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=f794685e9a12e5965d4ac3964e118cd822400481;p=vcut.git

Merge branch 'master' of cvs.ucw.cz:/home/mj/GIT/vcut
---

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