From db26e066284bd45855498092dacd72cadcdef52a Mon Sep 17 00:00:00 2001
From: Randy Brown <randy.brown@stord.com>
Date: Fri, 29 Oct 2021 14:54:42 -0500
Subject: [PATCH] nullish -> or

---
 index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.js b/index.js
index 89e39e6..d910a8e 100644
--- a/index.js
+++ b/index.js
@@ -30,7 +30,11 @@ try {
 
         if (channelId.length > 0 && (message.length > 0 || payload)) {
             // post message
+<<<<<<< HEAD
             web.chat.postMessage({ channel: channelId, text: message, ...(payload ?? {}) });
+=======
+            web.chat.postMessage({channel: channelId, text: message, ...(payload || {})});
+>>>>>>> 3cdd60e (nullish -> or)
         } else {
             console.log('missing either channel-id, slack-message or payload! Did not send a message via chat.postMessage with botToken');
         }