frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup merge

Browse Source
This commit is contained in:
Nick O'Leary
2021-01-18 15:11:24 +00:00
parent 7531314e3f
commit 9f71dbb006
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@@ -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);
}