resolve merge conflict

9 years ago · b522853b29
parent 819788f6ff eb16ee0beb
commit b522853b29
1 changed files with 1 additions and 0 deletions
--- a/app.js
+++ b/app.js
@ -69,4 +69,5 @@ var konamiCheck = function(e) {
  } else {
    idx = 0;
  }
+
 };