From 818534ce607a551f27703155ec0d532df0bcff58 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Feb 2018 11:58:28 -0500 Subject: Fix --- commands/warn.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'commands') diff --git a/commands/warn.js b/commands/warn.js index e290be2..9fc2272 100644 --- a/commands/warn.js +++ b/commands/warn.js @@ -1,13 +1,7 @@ exports.run = (bot, msg, args) => { -<<<<<<< HEAD if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to warn.'); const warnReason = args.slice(1); const victim = msg.mentions.users.first(); -======= - if (!message.author.permissions.has("MANAGE_MESSAGES")) return message.channel.send(':warning: You cannot warn members due to your permission level.'); - let warnReason = args.slice(1); - var victim = message.mentions.users.first(); ->>>>>>> master msg.channel.send(`Successfully logged ${victim.user.tag}'s warning.`); -- cgit v1.2.3