From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 24 Aug 2009 21:44:19 +0000 (-0400)
Subject: remove some merge cruft from the end of twitter.php
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ce442c049b8286451dcd9fb7efc9eea71f4de737;p=quix0rs-gnu-social.git

remove some merge cruft from the end of twitter.php
---

diff --git a/lib/twitter.php b/lib/twitter.php
index 11c1374283..2a8f6d7d88 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);
-        }
-    }
-
-}
-