Fixed inconsistencies in merging

exp_build/experiment.js

@@ -24,7 +24,7 @@ function getAssessmentPath(src, units) {
       let paths = getAssessmentPath(nextSrc, unit.units);
       assessmentPath.push(...paths);
     }
-    if (unit["content-type"] === "assesment" || unit["content-type"] === "assessment") {
+    if(unit["content-type"] === ContentTypes.ASSESMENT || unit["content-type"] === ContentTypes.ASSESSMENT){
       const quiz = path.resolve(src, unit.source);
       assessmentPath.push(quiz);
     }

logger.js

@@ -38,10 +38,6 @@ module.exports.addInfo = function () {
   log.add(new winston.transports.Console({level: "info",format: combine(colorize({all: true}),timestamp(),vlabsDefaultFormat), handleExceptions: true}))
 }
 
-module.exports.addInfo = function () {
-  log.add(new winston.transports.Console({level: "info",format: combine(colorize({all: true}),timestamp(),myFormat), handleExceptions: true}))
-}
-
 module.exports.debug = module.exports.log = function () {
   log.debug.apply(log, formatLogArguments(arguments))
 }

main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const shell = require("shelljs");
-const { BuildEnvs, validBuildEnv } = require("./enums.js");
+const { BuildEnvs, validBuildEnv, ContentTypes } = require("./enums.js");
 const { run } = require("./exp_build/exp_gen.js");
 const minimist = require("minimist");
 const Config = require("./config.js");
@@ -290,12 +290,6 @@ function main() {
   }
 }
 
-module.exports = {
-  build,
-  validate,
-  clean,
-  deployLocal
-}
 
 // call main function if this file is run directly
 if (require.main === module) {
@@ -318,3 +312,10 @@ if (require.main === module) {
 // node main.js clean ../
 // Deploy
 // node main.js deploy ../
+
+module.exports = {
+  build,
+  validate,
+  clean,
+  deployLocal
+}