Browse code

Fix merge conflict in donate-options page

hiromipaw authored on 26/12/2017 11:20:41
Showing 3 changed files
... ...
@@ -10,4 +10,4 @@
10 10
 #
11 11
 # e.g.:
12 12
 # export TORGIT=/home/weasel/projects/tor/tor/.git
13
-export TORGIT=set this to your tor.git path
13
+export TORGIT=/home/arthur/projects/tor/.git
14 14
deleted file mode 120000
... ...
@@ -1 +0,0 @@
1
-hiro@coruscant.6211:1514282996
2 0
\ No newline at end of file
... ...
@@ -31,11 +31,7 @@ form#makeDonation {
31 31
    <div class="hundred toptwenty">
32 32
     <div class="dbox donate">
33 33
     <h3>Donate Bitcoin</h3>
34
-<<<<<<< HEAD
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 34
 <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
39 35
   <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
40 36
         <input name="action" type="hidden" value="checkout">
41 37
         <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">