diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-25 17:58:44 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-25 17:58:44 -0400 |
| commit | 077955cb1d45f866d65aebdc42f5e3e71dc74045 (patch) | |
| tree | b73f71a010e5cd27a0b03245400924911a51d199 | |
| parent | c87e1de0178ed61a8fe1e4cbbc02e19130014d96 (diff) | |
merge problem with scripts/twitterstatusfetcher
| -rwxr-xr-x | scripts/twitterstatusfetcher.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php index 082bcc962..f5289c5f4 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(); |