fixing unmerged files

author skodak <skodak>

Thu, 6 Dec 2007 08:44:07 +0000 (08:44 +0000)

committer skodak <skodak>

Thu, 6 Dec 2007 08:44:07 +0000 (08:44 +0000)
author skodak <skodak>
Thu, 6 Dec 2007 08:44:07 +0000 (08:44 +0000)
committer skodak <skodak>
Thu, 6 Dec 2007 08:44:07 +0000 (08:44 +0000)
diff --git a/README.txt b/README.txt

index 99fabfd91a1e35a6bce757b4728eea153bc14077..0f11194f8da9f920fa39155af598510050c0cdc8 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README     $Id$
+README      $Id$
  ------
  
  QUICK INSTALL