Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz

1 files changed, 4 insertions, 4 deletions

diff --git a/fixup_replies.php b/fixup_replies.php
index a9ada0756..51ecf7afa 100755
--- a/fixup_replies.php
+++ b/fixup_replies.php
@@ -20,8 +20,8 @@
 
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-	print "This script must be run from the command line\n";
-	exit();
+    print "This script must be run from the command line\n";
+    exit();
 }
 
 define('INSTALLDIR', dirname(__FILE__));
@@ -35,6 +35,6 @@ $notice = new Notice();
 $cnt = $notice->find();
 
 while ($notice->fetch()) {
-	common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
-	common_save_replies($notice);
+    common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
+    common_save_replies($notice);
 }