message: Fix for merge diff issues
diff: @@ -170,7 +170,6 @@ var PptxGenJS = function(){
  zip.file("ppt/presProps.xml", makeXmlPresProps());
  zip.file("ppt/tableStyles.xml", makeXmlTableStyles());
  zip.file("ppt/viewProps.xml", makeXmlViewProps());
  - //
  // Create a Layout/Master/Rel/Slide file for each SLIDE
  for ( var idx=0; idx<gObjPptx.slides.length; idx++ ) {
  @@ -330,7 +329,9 @@ var PptxGenJS = function(){
  });
  });
  - // STEP 3: Push the PPTX file to browser
  + // STEP 3: Wait for Promises (if any) then push the PPTX file to client-browser
  + Promise.all( arrChartPromises )
  + .then(function(arrResults){
  var strExportName = ((gObjPptx.fileName.toLowerCase().indexOf('.ppt') > -1) ? gObjPptx.fileName : gObjPptx.fileName+gObjPptx.fileExtn);
  if ( NODEJS ) {
  zip.generateAsync({type:'nodebuffer'}).then(function(content){ fs.writeFile(strExportName, content, callback(strExportName)); });
  @@ -338,6 +339,10 @@ var PptxGenJS = function(){
  else {
  zip.generateAsync({type:'blob'}).then(function(content){ writeFileToBrowser(strExportName, content, callback); });
  }
  + })
  + .catch(function(strErr){
  + console.error(strErr);
  + });
  }
  function writeFileToBrowser(strExportName, content, callback) {
  