summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-24 17:44:19 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-24 17:44:19 -0400
commitce442c049b8286451dcd9fb7efc9eea71f4de737 (patch)
tree60fc41e5a73e0fdc04260cb39c28a8bb8769552f
parentff87732053bae38879988ba7d002a294998ccb4e (diff)
remove some merge cruft from the end of twitter.php
-rw-r--r--lib/twitter.php61
1 files changed, 0 insertions, 61 deletions
diff --git a/lib/twitter.php b/lib/twitter.php
index 11c137428..2a8f6d7d8 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -255,64 +255,3 @@ function remove_twitter_link($flink)
}
}
-
- $result = mail_twitter_bridge_removed($user);
-
- if (!$result) {
-
- $msg = 'Unable to send email to notify ' .
- "$user->nickname (user id: $user->id) " .
- 'that their Twitter bridge link was ' .
- 'removed!';
-
- common_log(LOG_WARNING, $msg);
- }
- }
-
-}
-
- $result = mail_twitter_bridge_removed($user);
-
- if (!$result) {
-
- $msg = 'Unable to send email to notify ' .
- "$user->nickname (user id: $user->id) " .
- 'that their Twitter bridge link was ' .
- 'removed!';
-
- common_log(LOG_WARNING, $msg);
- }
- }
-
-}
-
- $result = mail_twitter_bridge_removed($user);
-
- if (!$result) {
-
- $msg = 'Unable to send email to notify ' .
- "$user->nickname (user id: $user->id) " .
- 'that their Twitter bridge link was ' .
- 'removed!';
-
- common_log(LOG_WARNING, $msg);
- }
- }
-
-}
-
- $result = mail_twitter_bridge_removed($user);
-
- if (!$result) {
-
- $msg = 'Unable to send email to notify ' .
- "$user->nickname (user id: $user->id) " .
- 'that their Twitter bridge link was ' .
- 'removed!';
-
- common_log(LOG_WARNING, $msg);
- }
- }
-
-}
-