conflict fix

This commit is contained in:
Alexey Pavlov 2022-07-28 13:43:39 -04:00
commit 8b76e7aa22
1 changed files with 0 additions and 12 deletions

View File

@ -1,12 +0,0 @@
<br/>
<p align="center">
<a href="https://github.com/mcpiscript/Planet">
<img src="https://github.com/mcpiscript/planet/raw/master/planet/assets/img/full/logo512.png" alt="Logo" width="80" height="80">
</a>
<h3 align="center">Planet Launcher Website</h3>
<p align="center">The website for the planet launcher project. (Under development)</p>
<p align="center">https://mcpiscript.github.io/Planet/</p>