remove some merge cruft from the end of twitter.php

diff --git a/lib/twitter.php b/lib/twitter.php
index 11c1374283c2d820173302748cee1a7db725d9df..2a8f6d7d88cd0e0ad899431eabbc128fe878b884 100644 (file)
--- 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);
-        }
-    }
-
-}
-