docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00
Code Issues Releases Wiki Activity

LOL: Remove merge conflict marker

Browse Source
This commit is contained in:
Phil Haack 2012-12-04 11:23:00 -08:00 committed by Haacked
parent 4158829a4e
commit 0e60fdd313
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
licenses/permissive/bsd-3-clause/index.html
View File

@ -59,7 +59,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
Creative Commons Attribution 3.0 Unported License</a>. Creative Commons Attribution 3.0 Unported License</a>.
</p> </p>
</div> </div>
>>>>>>> Convert licenses to plain text
</div> </div>
</body> </body>
</html> </html>