From 077955cb1d45f866d65aebdc42f5e3e71dc74045 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 17:58:44 -0400
Subject: [PATCH] merge problem with scripts/twitterstatusfetcher

---
 scripts/twitterstatusfetcher.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 082bcc9622..f5289c5f4b 100755
--- 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();