|
1 | 1 | <!doctype html> |
2 | | -<<<<<<< HEAD |
3 | | -<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ --> |
4 | | -<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]--> |
5 | | -<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]--> |
6 | | -<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]--> |
7 | | -<!-- Consider adding a manifest.appcache: h5bp.com/d/Offline --> |
8 | | -<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> |
9 | | -<head> |
10 | | - <meta charset="utf-8"> |
11 | | - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
12 | | - <title><%= gameName %></title> |
13 | | - <meta name="description" content=""> |
14 | | - <meta name="viewport" content="width=device-width"> |
15 | | - <script src="src/bower_components/modernizr/modernizr.js"></script> |
16 | | - <style type="text/css">body {-webkit-tap-highlight-color: rgba(0,0,0,0); margin: 0;}</style> |
17 | | -</head> |
18 | | -<body> |
19 | | - <!--[if lt IE 8]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]--> |
20 | | - |
21 | | - <!-- Add your site or application content here --> |
22 | | - |
23 | | - <script src="src/bower_components/jquery/jquery.js"></script> |
24 | | - <script src="src/libs/Crafty/crafty.js"></script> |
25 | | - <script src="src/bower_components/underscore/underscore.js"></script> |
26 | | - <script src="src/bower_components/backbone/backbone.js"></script> |
27 | | - <script src="src/bower_components/requirejs-jquery/parts/require.js"></script> |
28 | | - <script src="src/game.js"></script> |
29 | | - |
30 | | - <!-- These are debugging libraries and can be removed if you don't want the debugger. --> |
31 | | - <script src="src/libs/CraftyDebug/craftyDebug.js"></script> |
32 | | - <script src="src/libs/CraftyDebug/panels/assets.js"></script> |
33 | | - <script src="src/libs/CraftyDebug/panels/entities.js"></script> |
34 | | - <script type="text/javascript"> |
35 | | - gameContainer = { |
36 | | - env : 'dev', |
37 | | - gameVersion : '0.0.1', |
38 | | - scene : 'main' |
39 | | - }, |
40 | | - sc = [], // container for backbone scene elements |
41 | | - infc = [] // container for backbone interface elements |
42 | | - |
43 | | - $(document).ready(function () { |
44 | | - Crafty.debugBar.show(); |
45 | | - }); |
46 | | - </script> |
47 | | - <!-- end scripts --> |
48 | | - |
49 | | - <!-- Setup google analytics --> |
50 | | - <script> |
51 | | - var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; |
52 | | - (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0]; |
53 | | - g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js'; |
54 | | - s.parentNode.insertBefore(g,s)}(document,'script')); |
55 | | - </script> |
56 | | - <script src="//localhost:35729/livereload.js"></script> |
57 | | -</body> |
58 | | -======= |
59 | 2 | <html> |
60 | 3 | <head> |
61 | 4 | <meta charset="utf-8"> |
|
64 | 7 | <meta name="description" content=""> |
65 | 8 | <meta name="viewport" content="width=device-width"> |
66 | 9 | </head> |
| 10 | + <body> |
67 | 11 |
|
68 | | - <body></body> |
69 | | ->>>>>>> bd10ddbf8732c0e714aef30dafae4eec3374c87a |
| 12 | + </body> |
70 | 13 | </html> |
0 commit comments