commit 2921d7c38d0e0b2a82c0cd0c120abf0518235a6c Merge: 5e90acd5 232e4645 Author: hiromipaw <hiro@torproject.org> Date: Tue Dec 26 11:18:34 2017 +0100 Fix merge conflict in donate-options page donate/en/.#donate-options.wml | 1 + donate/en/donate-options.wml | 4 ++++ 2 files changed, 5 insertions(+) diff --cc donate/en/.#donate-options.wml index 00000000,00000000..b1e69512 new file mode 120000 --- /dev/null +++ b/donate/en/.#donate-options.wml @@@ -1,0 -1,0 +1,1 @@@ ++hiro@coruscant.6211:1514282996 diff --cc donate/en/donate-options.wml index 42d4a706,53513557..2be04bbc --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@@ -31,7 -31,7 +31,11 @@@ form#makeDonation <div class="hundred toptwenty"> <div class="dbox donate"> <h3>Donate Bitcoin</h3> ++<<<<<<< HEAD +<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> ++======= + <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> ++>>>>>>> 232e4645232bbcf93f7d7bb95bb04c723852e9f6 <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> <input name="action" type="hidden" value="checkout"> <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">