diff options
| -rwxr-xr-x | scripts/twitterstatusfetcher.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php index 082bcc962..f5289c5f4 100755 --- a/scripts/twitterstatusfetcher.php +++ b/scripts/twitterstatusfetcher.php @@ -97,10 +97,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon { global $_DB_DATAOBJECT; -======= - global $_DB_DATAOBJECT; - ->>>>>>> 0.8.x:scripts/twitterstatusfetcher.php $flink = new Foreign_link(); $conn = &$flink->getDatabaseConnection(); |