From: skodak <skodak>
Date: Thu, 6 Dec 2007 08:44:07 +0000 (+0000)
Subject: fixing unmerged files
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3f4e29b4ac82c68ff754c78fc8b79cb510316e06;p=moodle.git

fixing unmerged files
---

diff --git a/README.txt b/README.txt
index 99fabfd91a..0f11194f8d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README     $Id$
+README      $Id$
 ------
 
 QUICK INSTALL