From b72178f3913bcc5445b5beb742147f916b3d545f Mon Sep 17 00:00:00 2001 From: Trey Date: Fri, 23 Feb 2018 19:46:30 -0500 Subject: vscode fucked the file in the anus --- bot.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'bot.js') diff --git a/bot.js b/bot.js index 8250f3b..ba93e4b 100644 --- a/bot.js +++ b/bot.js @@ -7,11 +7,7 @@ bot.on('ready', () => { }); bot.on('guildMemberAdd', (member) => { -<<<<<<< HEAD - bot.channels.get('416633835216830495').send(`Welcome @${member.user.tag}!`); -======= bot.channels.get('416633835216830495').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules in #rules!`); ->>>>>>> 1e399cdcb20c5eb4b8f8aa5fff2a19fd05505c37 const role = member.guild.roles.find('name', 'Trainers'); member.addRole(role); }); -- cgit v1.2.3