resolving merge conflict

diff --git a/search/indexer.php b/search/indexer.php
index 87fffdbfa161db95089af6d2ea7572824fb36549..d00928f425c6fb9e6de4ee40d9c94c2319796bce 100644 (file)
--- 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