From 91b6df6781a18f7f29c41ff53be1e7124222e57f Mon Sep 17 00:00:00 2001 From: pokesudenk Date: Sat, 24 Feb 2018 11:57:49 -0500 Subject: vscode assraping my files --- commands/warn.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/commands/warn.js b/commands/warn.js index e290be2..49e7fdb 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