playing

[vcut.git] / README

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