64639a7834
Conflicts: index.html test
18 lines
443 B
HTML
18 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
|