X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=README;h=293cd06e76fc0412b0320d8204c38b8e34ce4dbc;hb=5a3ab0e1001241d995ebe1ef6569660f297a1911;hp=7993a895ef2c40fd70c92fca733e629cfbbfe044;hpb=fec3329862d0ed2702a954a7155a59f8f103d55b;p=vcut.git

diff --git a/README b/README
index 7993a89..293cd06 100644
--- 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.