Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00
parent 56e45ba9dd 9c67d4988f
commit b49d2fd343
23 changed files with 1159 additions and 390 deletions
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -364,7 +364,6 @@ exports.completedZiplineOrBasejump = function (req, res, next) {
    });

    var index = req.user.uncompletedCoursewares.indexOf(coursewareHash);
-    console.log('index here', index)
    if (index > -1) {
      req.user.progressTimestamps.push(Date.now() || 0);
      req.user.uncompletedCoursewares.splice(index, 1);