privacyguides/privacytools.io
Archived
1
0
Fork 0
Code Issues 304 Pull Requests 47 Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
J. C
2021-05-03 07:54:24 -05:00
parent 54b63b8fd7
commit 67b1f64533
4 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pages/donate.html
View File

@ -32,77 +32,56 @@ permalink: /donate/
<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
<div class="form-group row">
<<<<<<< HEAD
<label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
</div>
</div>
<div class="form-group row">
<<<<<<< HEAD
<label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><em class="fa fa-qrcode"></em></a></label>
=======
<label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><em class="fa fa-qrcode"></em></a></label>
>>>>>>> fix
<div class="col-sm-8">
<input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>
</div>

3
pages/sponsors.html
View File

@ -48,13 +48,10 @@ permalink: /sponsors/
<p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
<h5>General Information</h5>
<p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
<<<<<<< HEAD
<p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
<h5><em class="fas fa-fw fa-user text-info"></em> Backers - $10–$24</h5>
=======
<p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
<h5><em class="fas fa-fw fa-user text-info"></em> Backers - $10–$24</h5>
>>>>>>> fix
<ul>
<li>Your name added to the list of sponsors on this page.</li>
</ul>