Resolved merge conflict

This commit is contained in:
Othneil Drew
2020-11-22 18:08:15 -06:00
+1 -16
View File
@@ -7,23 +7,9 @@
***
***
*** To avoid retyping too much info. Do a search and replace for the following:
*** github_username, repo_name, twitter_handle, email
*** github_username, repo_name, twitter_handle, email, project_title, project_description
-->
<!--
*** Thanks for checking out this README Template. If you have a suggestion that would
*** make this better, please fork the repo and create a pull request or simply open
*** an issue with the tag "enhancement".
*** Thanks again! Now go create something AMAZING! :D
***
***
***
*** To avoid retyping too much info. Do a search and replace for the following:
*** github_username, repo_name, twitter_handle, email,
-->
<!-- PROJECT SHIELDS -->
@@ -210,4 +196,3 @@ Project Link: [https://github.com/github_username/repo_name](https://github.com/
[license-url]: https://github.com/github_username/repo/blob/master/LICENSE.txt
[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
[linkedin-url]: https://linkedin.com/in/github_username
[product-screenshot]: images/screenshot.png