Merge branch '0.8.x' into testing

[quix0rs-gnu-social.git] / scripts / twitterstatusfetcher.php

diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index f5289c5f4b7384a1daeaa7de0c8e6119cbbb820d..082bcc9622a5b929e85bc947a21d547ff08afa45 100755 (executable)
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -97,6 +97,10 @@ class TwitterStatusFetcher extends ParallelizingDaemon
     {
         global $_DB_DATAOBJECT;
 
+=======
+        global $_DB_DATAOBJECT;
+
+>>>>>>> 0.8.x:scripts/twitterstatusfetcher.php
         $flink = new Foreign_link();
         $conn = &$flink->getDatabaseConnection();