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

[vcut.git] / README

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