wyrian/index.html
Arian Glander 64639a7834 Merge branch 'master' of github.com:glenux/wyrian
Conflicts:
	index.html
test
2011-02-12 01:07:46 +01:00

19 lines
443 B
HTML

<<<<<<< HEAD
<!doctype html>
<html>
<head>
<link rel="stylesheet" media="all" href="css/style.css" />
</head>
<body>
<div id="background"></div>
<div id="ground"></div>
<div id="game"><div id="ship"></div></div>
<div id="hud"></div>
<script type="text/javascript" src="js/jquery-1.5.js"></script>
<script type="text/javascript" src="js/wyrian.js"></script>
</body>
</html>
=======
blbabnlazblk
>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d