Fix merge conflicts.
This commit is contained in:
		| @@ -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> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 J. C
					J. C