Merging correctly conflicts

Author: munozemilio

packages/luis/src/parser/converters/lumerger.js

@@ -16,21 +16,13 @@ const luisJSON = require('./../luisfile/parseLuisFile');
 
 module.exports = {
     mergeAndResolveReferences: async function (luObjArray, verbose, luis_culture, luSearchFn){
-<<<<<<< HEAD
-        let allParsedContent = await buildJsonObject(luObjArray, verbose, luis_culture, luSearchFn)
-=======
         let allParsedContent = await buildLuJsonObject(luObjArray, verbose, luis_culture, luSearchFn)
->>>>>>> master
         await resolveReferencesInUtterances(allParsedContent)
         return allParsedContent
     }
 }
 
-<<<<<<< HEAD
-const buildJsonObject = async function(luObjArray, log, luis_culture, luSearchFn = findLuFilesInDir){
-=======
 const buildLuJsonObject = async function(luObjArray, log, luis_culture, luSearchFn = findLuFilesInDir){
->>>>>>> master
     let allParsedLUISContent = []
     let allParsedQnAContent = []
     let allParsedAlterationsContent = []

packages/luis/src/parser/converters/lutoluisconverter.js

@@ -8,16 +8,11 @@ const LUISObjNameEnum = require('./../lufile/enums/luisobjenum')
 
 module.exports = {
     /**
-<<<<<<< HEAD
-     * Parses a list of luObject into a LUIS JSON
-     * @param {luObject []} luArray luObject list to be parsed
-=======
      * Parses a list of luObject to a LUIS JSON
      * @param {luObject []} luArray luObject list to be parsed
      * @param {boolean} verbose verbose logging
      * @param {string} luis_culture luis culture
      * @param {function} luSearchFn function to search for lu references: function search(source: string, additionalFilesToParse: Array<string>): Array<luObject>
->>>>>>> master
      * @returns {LUIS} Collated LUIS json contents
      * @throws {exception} Throws on errors. exception object includes errCode and text. 
      */

packages/luis/src/parser/luisfile/parseLuisFile.js

@@ -10,11 +10,7 @@ module.exports = {
         try {
             LUISJSON = await JSON.parse(LUISFileContent);
         } catch (err) {
-<<<<<<< HEAD
-            throw (new exception(retCode.errorCode.INVALID_INPUT_FILE, 'Sorry, error parsing file as LUIS JSON'));
-=======
             throw (new exception(retCode.errorCode.INVALID_INPUT_FILE, 'Sorry, error parsing content as LUIS JSON'));
->>>>>>> master
         }
         await validateLUISJSON(LUISJSON)
         return LUISJSON;