hackathon33/index.html at master · JsonRoyJones/hackathon33 · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
<html>
<<<<<<< HEAD
  <head>
    <meta charset="UTF-8" />
    <title>Imposter Monster</title>
    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
    <!-- append to manifest.json in order to have chrome ext recognize jquery -->
    <link rel="stylesheet" href="styles.css" />
  </head>
  <body>
    <div id="stage">
      <div class="a"></div>
      <div class="b"></div>
      <div class="c"></div>
      <div class="d"></div>
    </div>
    <!--stage-->
  </body>
  <script src="monster.js"></script>
  <script src="main.js"></script>
</html>
=======
<head>
  <meta charset="UTF-8">
  <title>Imposter Monster</title>
  <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
  <link rel="stylesheet" href="src/styles.css">
</head>
<body>
  <div class='a'></div>
</body>
<script src='/monster.js'></script>
<script src="./src/main.js"></script>
</html>
>>>>>>> bfefe2197b172995c5c0331604646e2b4359646c