Skip to content

W
will-o-wisp
Commit 8dc2f81a authored by Santino Campos's avatar Santino Campos
Browse files
Options

Fix merge conflict on homepage.html

parents c5d4a78b d0a70820
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
heroes/templates/homepage.html
View file @ 8dc2f81a
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<h1> The Will of the Wisps Wiki </h1> <h1> The Will of the Wisps Wiki </h1>
<ol> <li> Jester - Health Points 660 - Base Attack Damage 64 </li> <li> Sunflowey - Health Points 650 - Base Attack Damage - 43 </li> <li> Cloud - Health Points 600 - Base Attack Damage - 57 </li> </ol> <ol> <li> Jester - Health Points 660 - Base Attack Damage 64 </li> <li> Sunflowey - Health Points 650 - Base Attack Damage - 43 </li> <li> Cloud - Health Points 600 - Base Attack Damage - 57 </li> </ol>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment