#resolve merge conflict

This commit is contained in:
Godmave committed 2019-08-04 17:51:09 +02:00
1 parent 6ea47cb6af
commit f32624586b
1 file changed
-3
-3
View File
@@ -979,9 +979,6 @@ io.on('connection', function (socket) {
});
// handle plugins on the master
async function getPlugins(){
let startPluginLoad = Date.now();
async function getPlugins(){
const pluginManager = require("lib/manager/pluginManager.js")(config);
let plugins = [];