wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge problem with scripts/twitterstatusfetcher

Browse Source
This commit is contained in:
Evan Prodromou 2009-08-25 17:58:44 -04:00
parent c87e1de017
commit 077955cb1d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/twitterstatusfetcher.php
View File

@ -97,10 +97,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
{ {
global $_DB_DATAOBJECT; global $_DB_DATAOBJECT;
=======
global $_DB_DATAOBJECT;
>>>>>>> 0.8.x:scripts/twitterstatusfetcher.php
$flink = new Foreign_link(); $flink = new Foreign_link();
$conn = &$flink->getDatabaseConnection(); $conn = &$flink->getDatabaseConnection();