Gerold55
/
Dream-Blocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	index.html
master
azekillDIABLO 2017-06-17 16:47:42 +02:00
parent 3332f9bde6 7e3df5281f
commit 576511ce70
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@ -8,11 +8,18 @@
<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>