From: diml <diml>
Date: Wed, 26 Dec 2007 10:24:30 +0000 (+0000)
Subject: resolving merge conflict
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=85e76cf40b173de102179a1d90103aebf92c7334;p=moodle.git

resolving merge conflict
---

diff --git a/search/indexer.php b/search/indexer.php
index 87fffdbfa1..d00928f425 100644
--- a/search/indexer.php
+++ b/search/indexer.php
@@ -100,7 +100,7 @@ if (!$dbcontrol->checkDB()) {
 }
 */
 // New regeneration
-mtrace("Deleting old index entries.");
+mtrace('Deleting old index entries.');
 delete_records(SEARCH_DATABASE_TABLE);
 
 //begin timer