resolve merge conflict

solution
Matt Lane 9 years ago
commit b522853b29
  1. 1
      app.js

@ -69,4 +69,5 @@ var konamiCheck = function(e) {
} else { } else {
idx = 0; idx = 0;
} }
}; };
Loading…
Cancel
Save