index.html

@@ -132,8 +132,11 @@
     <script src="assets/src/service/score-service.js"></script>
     <script src="assets/src/service/leaderboard-service.js"></script>
     <script src="js/login.js"></script>
+<<<<<<< Updated upstream
     <script src="js/leaderboard.js"></script>
     <!--Navigation Script -->
+=======
+>>>>>>> Stashed changes
     <script src="js/play.js"></script>
     <script src="js/navigation.js"></script>
 </body>