merge problem with scripts/twitterstatusfetcher

2009-08-25 17:58:44 -04:00
parent c87e1de017
commit 077955cb1d
1 changed files with 0 additions and 4 deletions
--- 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();