]> mj.ucw.cz Git - vcut.git/commitdiff
projects / vcut.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 8e7ba85)
playing
authorMartin Mares <mj@albireo.ucw.cz>
Thu, 9 Feb 2006 14:15:06 +0000 (15:15 +0100)
committerMartin Mares <mj@albireo.ucw.cz>
Thu, 9 Feb 2006 14:15:06 +0000 (15:15 +0100)
README patch | blob | history

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