From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Jul 2008 18:46:30 -0400 Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines. darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz --- fixup_replies.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fixup_replies.php') 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); } -- cgit v1.2.3-54-g00ecf