resolve merge conflicts

2015-03-21 12:03:16 +09:00
parent 120cc113b9 94e8550408
commit d48da59aa7
107 changed files with 9235 additions and 1651 deletions
--- a/seed_data/seed.js
+++ b/seed_data/seed.js
@@ -55,4 +55,4 @@ Courseware.remove({}, function(err, data) {
        CompletionMonitor();
    });
    console.log('coursewares');
-});
+});