correct pushing error
parent
576511ce70
commit
9a1c112f94
|
@ -8,18 +8,11 @@
|
|||
<body>
|
||||
<h1>Dream Blocks ❤</h1>
|
||||
<form>
|
||||
<<<<<<< HEAD
|
||||
<button href="https://azekilldiablo.github.io/Dream-Blocks/">Home</button>
|
||||
<button href="game">About the game</button>
|
||||
<button href="gallery">Screenshots</button>
|
||||
<button href="download">Get the game</button>
|
||||
<button href="actors">Contributors</button>
|
||||
=======
|
||||
<button formaction="game">About the game</button>
|
||||
<button formaction="gallery">Screenshots</button>
|
||||
<button formaction="download">Get the game</button>
|
||||
<button formaction="actors">Contributors</button>
|
||||
>>>>>>> origin/master
|
||||
</form>
|
||||
<hr>
|
||||
<p>Welcome to Dream Blocks website! Dream Blocks is a game made by LordStephen77 and is inspired by Minetest. It's a small, 2D, Java written and open-source game!</p>
|
||||
|
|
Loading…
Reference in New Issue