fix conflict

2014-03-12 13:03:37 +01:00
parent ebf96bfebb 385b65d086
commit 03ec53ea25
8 changed files with 122 additions and 35 deletions
@@ -20,7 +20,10 @@
  <div class="container">
    <div class="heading">
      <h1 class="title">2048</h1>
-      <div class="score-container">0</div>
+      <div class="scores-container">
+        <div class="score-container">0</div>
+        <div class="best-container">0</div>
+      </div>
    </div>
    <p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p>

@@ -89,6 +92,7 @@
  <script src="js/html_actuator.js"></script>
  <script src="js/grid.js"></script>
  <script src="js/tile.js"></script>
+  <script src="js/local_score_manager.js"></script>
  <script src="js/game_manager.js"></script>
  <script src="js/application.js"></script>