fix: updates from master

mabunixda · Mar 4, 2021 · 73d9dc7 · 73d9dc7
2 parents be24760 + 279d50f
commit 73d9dc7
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 0 deletions.
diff --git a/alexa/alexa-home-controller.js b/alexa/alexa-home-controller.js
@@ -198,8 +198,12 @@ module.exports = function(RED) {
       lights: node.generateAPIDeviceList(id),
       date: new Date().toISOString().split('.').shift(),
     };
+<<<<<<< HEAD
     const content = Mustache.render(template, data)
         .replace(/(\{\s+)?,?[^,]+_emptyIteratorStopper": \{\}/g, '$1');
+=======
+    const content = Mustache.render(template, data).replace(/(\{\s+)?,?[^,]+_emptyIteratorStopper": \{\}/g, '$1');
+>>>>>>> master
     RED.log.debug(node.name + + '/' + id +
       ' - listing ' + request.params.username +
       ' #' + data.lights.length + ' api information to ' +

diff --git a/package-lock.json b/package-lock.json