git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 077955cb authored by Evan Prodromou's avatar Evan Prodromou

merge problem with scripts/twitterstatusfetcher

parent c87e1de0
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment