fix merge conflicts

2015-09-14 00:02:42 -07:00
parent f4c20e80ef
commit 953df6826b
7 changed files with 95 additions and 334 deletions
--- a/client/main.js
+++ b/client/main.js
@@ -236,12 +236,6 @@ $(document).ready(function() {
          }
      });

-      $('.next-challenge-button').unbind('click');
-      $('.next-challenge-button').on('click', function() {
-          l = location.pathname.split('/');
-          window.location = '/challenges/' + (parseInt(l[l.length - 1]) + 1);
-      });
-
      $('#complete-courseware-dialog').on('hidden.bs.modal', function() {
          editor.focus();
      });