resolve merge conflict

2016-02-25 18:39:09 -08:00 · 2016-02-25 18:39:09 -08:00 · b522853b29
commit b522853b29
parent 819788f6ff eb16ee0beb
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;
  }
 };