Finish fixing merge conflicts
This commit is contained in:
@@ -219,8 +219,6 @@
|
||||
<div class="col">
|
||||
<h2 id="startmail" class="anchor"><a href="#startmail"><em class="fas fa-link anchor-icon"></em></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
|
||||
<p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
|
||||
<h2 id="startmail" class="anchor"><a href="#startmail"><em class="fas fa-link anchor-icon"></em></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
|
||||
<p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
|
||||
|
||||
<h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
|
||||
<p>Personal accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360007297457-Aliases">Custom or Generated</a> aliases. Business accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360006840058">Domain aliases</a>.</p>
|
||||
|
Reference in New Issue
Block a user