From 9f71dbb0060c9070fc99f683cf71c5f0f8427679 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <knolleary@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:11:24 +0000
Subject: [PATCH] Fixup merge

---
 packages/node_modules/@node-red/editor-client/src/js/red.js | 1 -
 packages/node_modules/@node-red/registry/lib/loader.js      | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index e3439c435..229147b10 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -25,7 +25,6 @@ var RED = (function() {
             cache: false,
             url: 'plugins',
             success: function(data) {
-                console.log(data);
                 loader.reportProgress(RED._("event.loadPlugins"), 13)
                 RED.i18n.loadPluginCatalogs(function() {
                     loadPlugins(function() {
diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index d29eadc66..74eaa05c1 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -478,7 +478,6 @@ function addModule(module) {
         return Promise.reject(e);
     }
     try {
-<<<<<<< HEAD
         var moduleFiles = {};
         var moduleStack = [module];
         while(moduleStack.length > 0) {
@@ -502,10 +501,6 @@ function addModule(module) {
             }
         }
         return loadNodeFiles(moduleFiles).then(() => module)
-=======
-        var moduleFiles = localfilesystem.getModuleFiles(module);
-        return loadModuleFiles(moduleFiles);
->>>>>>> Initial plugin runtime api implementation
     } catch(err) {
         return Promise.reject(err);
     }