Fix merge conflict in donate-options page
hiromipaw commited on 2017-12-26 11:18:34
Zeige 2 geänderte Dateien mit 5 Einfügungen und 0 Löschungen.
- donate/en/.#donate-options.wml 000000000..b1e695120
- donate/en/donate-options.wml 53513557d..2be04bbc4
| ... | ... |
@@@ -1,0 -1,0 +1,1 @@@ |
| 1 |
++hiro@coruscant.6211:1514282996 |
| ... | ... |
@@@ -31,7 -31,7 +31,11 @@@ form#makeDonation |
| 31 | 31 |
<div class="hundred toptwenty"> |
| 32 | 32 |
<div class="dbox donate"> |
| 33 | 33 |
<h3>Donate Bitcoin</h3> |
| 34 |
++<<<<<<< HEAD |
|
| 34 | 35 |
+<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipperbot">@tipprbot</a> on Twitter!)</p> |
| 36 |
++======= |
|
| 37 |
+ <p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p> |
|
| 38 |
++>>>>>>> 232e4645232bbcf93f7d7bb95bb04c723852e9f6 |
|
| 35 | 39 |
<form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
|
| 36 | 40 |
<input name="action" type="hidden" value="checkout"> |
| 37 | 41 |
<fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> |
| 38 | 42 |