We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

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
>>>>>>> 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