[tor-commits] [webwml/staging] Fix merge conflict in donate-options page

[arma]

commit 2921d7c38d0e0b2a82c0cd0c120abf0518235a6c
Merge: 5e90acd5 232e4645
Author: hiromipaw 
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 ,..b1e69512
new file mode 12
--- /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 
 
  
  Donate Bitcoin
++<<< HEAD
 +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 https://twitter.com/tipperbot;>@tipprbot on Twitter!)
++===
+ 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 https://twitter.com/tipprbot;>@tipprbot on Twitter!)
++>>> 232e4645232bbcf93f7d7bb95bb04c723852e9f6
https://bitpay.com/checkout; method="post" 
onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
  
  



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix merge conflict in donate-options page

[arma]

commit c0cc2905dfc17791109aaeada45d826858e50c08
Merge: e7c3af0b 79d22985
Author: hiromipaw 
Date:   Tue Dec 26 11:20:41 2017 +0100

Fix merge conflict in donate-options page

 Makefile.local.sample  | 2 +-
 donate/en/.#donate-options.wml | 1 -
 donate/en/donate-options.wml   | 4 
 3 files changed, 1 insertion(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits