fix merge conflict

2014-03-12 11:23:22 +01:00
parent 3dd8f3e527 77654452a7
commit 39ebf51ce2
7 changed files with 88 additions and 17 deletions
@@ -15,7 +15,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>

@@ -73,6 +76,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>
 </body>