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

Use js-beautify for formatting HTML #1089

Closed
nitrohorse wants to merge 21 commits from add-beautify into master
pull from: add-beautify
merge into: privacyguides:master
Conversation 13 Commits 21 Files Changed 89 +43 -43
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 491d2f9eb0 - Show all commits

6
pages/providers/vpn.html
View File

@@ -5,7 +5,7 @@ title: "VPN Services"
description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic."
---
<<<<<<< HEAD {% include sections/vpn.html %}=======<div class="card border-danger">
<div class="card border-danger">
<div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
<div class="card-body">
<p class="card-text text-danger">Using a VPN will <strong>not</strong> keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.</p>
@@ -58,7 +58,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
<li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
</ol>
<p>
</p>
</div>
</div>
</div>
>>>>>>> origin/master