From 6dfc6cd13e1630437e546c65f856141a9cbabc12 Mon Sep 17 00:00:00 2001
From: Ben Hardill <hardillb@gmail.com>
Date: Thu, 8 Apr 2021 11:49:59 +0100
Subject: [PATCH] Fix some messages

---
 hardware/wemo/WeMoNG.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hardware/wemo/WeMoNG.js b/hardware/wemo/WeMoNG.js
index 5dcd4354..60f0b6c1 100644
--- a/hardware/wemo/WeMoNG.js
+++ b/hardware/wemo/WeMoNG.js
@@ -422,17 +422,11 @@ module.exports = function(RED) {
 
             if (!dev) {
                 //need to show that dev not currently found
-<<<<<<< HEAD
                 console.log('Device not discovered yet');
                 if (done) {
                     done("Device not discovered yet")
                 } else {
                     node.error("Device not discovered yet",msg)
-=======
-                console.log('no device found');
-                if (done) {
-                    done()
->>>>>>> Attempt to catch errors from wemo-lookup
                 }
                 return;
             }