mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
#resolve merge conflict
This commit is contained in:
1 parent
f32624586b
commit
ec0243d7cf
1 file changed
+1
@@ -980,6 +980,7 @@ io.on('connection', function (socket) {
|
|||||||
|
|
||||||
// handle plugins on the master
|
// handle plugins on the master
|
||||||
async function getPlugins(){
|
async function getPlugins(){
|
||||||
|
let startPluginLoad = Date.now();
|
||||||
const pluginManager = require("lib/manager/pluginManager.js")(config);
|
const pluginManager = require("lib/manager/pluginManager.js")(config);
|
||||||
let plugins = [];
|
let plugins = [];
|
||||||
let pluginsToLoad = await pluginManager.getPlugins();
|
let pluginsToLoad = await pluginManager.getPlugins();
|
||||||
|
|||||||
Reference in new issue
Block a user