Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
othneildrew committed Nov 23, 2020
2 parents bacdb11 + aa5c02e commit 5cbec28
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions BLANK_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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

0 comments on commit 5cbec28

Please sign in to comment.