From ec0243d7cf3195ff134be0280b40c13cf16026d8 Mon Sep 17 00:00:00 2001
From: Godmave <godmave@gmail.com>
Date: Sun, 4 Aug 2019 17:54:58 +0200
Subject: [PATCH] #resolve merge conflict

---
 master.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/master.js b/master.js
index 913fa65d..e8c47dff 100644
--- a/master.js
+++ b/master.js
@@ -980,6 +980,7 @@ io.on('connection', function (socket) {
 
 // handle plugins on the master
 async function getPlugins(){
+	let startPluginLoad = Date.now();
 	const pluginManager = require("lib/manager/pluginManager.js")(config);
 	let plugins = [];
 	let pluginsToLoad = await pluginManager.getPlugins();