github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Gold checkout: Fix mismerge to reddit/reddit.

Browse Source 
An extra branch got added here that was incorrect.
This commit is contained in:
Chris Dary
2014-11-23 10:08:49 -08:00
committed by Neil Williams
parent add5b0ed83
commit 84d39cecf5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/controllers/front.py
View File

@@ -1186,10 +1186,6 @@ class FrontController(RedditController):
"check the details by logging into your account "
"at:")
vendor_url = "https://www.paypal.com/us"
elif vendor in {"coinbase", "stripe"}: # Pending vendors
claim_msg = _("thanks for buying reddit gold! your transaction is "
"being processed. if you have any questions please "
"email us at %(gold_email)s")
elif vendor in {"coinbase", "stripe"}: # Pending vendors
claim_msg = _("Thanks for buying reddit gold! Your transaction is "
"being processed. If you have any questions please "