1 files changed, 0 insertions, 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.`);