From 1a3e785a8b104982813de25540d5c80cab55cb39 Mon Sep 17 00:00:00 2001
From: jtsshieh <jtsshieh@outlook.com>
Date: Fri, 23 Feb 2018 22:35:46 -0500
Subject: Update ban.js

---
 commands/ban.js | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/commands/ban.js b/commands/ban.js
index 5fa3da4..0a90c5b 100644
--- a/commands/ban.js
+++ b/commands/ban.js
@@ -1,5 +1,4 @@
 exports.run = (bot, msg, args) => {
-<<<<<<< HEAD
   if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members');
   if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members');
   const member = msg.mentions.members.first();
@@ -19,25 +18,3 @@ exports.help = {
   usage: '@<User> <...reason>',
   category: 'Moderation',
 };
-=======
-    if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members');
-    if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members');
-    const member = msg.mentions.members.first();
-    member.ban(msg.author.tag + ': ' + args.join(' ').slice(3 + member.user.id.length)).then(() => {
-      msg.channel.send(`Alright, I banned **${member.user.tag}** for the reason **${args.join(' ').slice(3 + member.user.id.length)}**`);
-    });
-  };
-  
-  exports.conf = {
-    aliases: [],
-    guildOnly: true,
-  };
-  
-  exports.help = {
-    name: 'ban',
-    description: 'Ban a user out of the server',
-    usage: '@<User> <...reason>',
-    category: 'Moderation',
-  };
-  
->>>>>>> master
-- 
cgit v1.2.3