Update list-ssdp.js

just fix the file :)
TheThingSystem · Jun 24, 2016 · 08d858c · 08d858c
1 parent c000d65
commit 08d858c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/scripts/list-ssdp.js b/scripts/list-ssdp.js
@@ -84,11 +84,8 @@ new SSDP().on('response', function(msg, rinfo) {
       } catch(ex) {
         return f(location, response.headers, data);
       }
-<<<<<<< Updated upstream
 
       if ((!!json.root) && (!json.root.URLBase)) json.root.URLBase = options.protocol + '//' + options.host + '/';
-=======
->>>>>>> Stashed changes
 
       if ((!json.root) || (!json.root.device.serviceList) || (!util.isArray(json.root.device.serviceList.service))) return;