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

---
 master.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/master.js b/master.js
index 24ece0e0..913fa65d 100644
--- a/master.js
+++ b/master.js
@@ -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 = [];