Merge Attempt 3

gamalielhere · Feb 3, 2016 · 93a6b80 · 93a6b80
1 parent 5bf94eb
commit 93a6b80
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/script.js b/js/script.js
@@ -12,10 +12,6 @@ $(document).ready(function() {
   var food;
   var snake;
   var score;
-<<<<<<< HEAD
-  var highscore = localStorage.topScore;
-=======
->>>>>>> master
   var speed;
   var highscore = 0;
   var headColor = "green",