From 882112976c312d5948e5505f26e90acf6d3ead78 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Feb 2018 20:33:07 -0500 Subject: Fixy fixy --- commands/Utility/userinfo.js | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'commands/Utility') diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js index 0154d98..d4ccb91 100644 --- a/commands/Utility/userinfo.js +++ b/commands/Utility/userinfo.js @@ -1,20 +1,4 @@ exports.run = async (bot, msg) => { -<<<<<<< HEAD - const { RichEmbed } = require('discord.js'); - if (!msg.mentions.users.first()) { - var user = msg.author; - } else { - var user = msg.mentions.members.first(); - }; - msg.channel.send( - new RichEmbed() - .setColor(0x00ae86) - .setTitle(`User Information`) - .addField('User ID', user.id) - .addField('Account Creation Date', user.user.createdAt) - .addField('Join Guild Date', user.joinedAt) - .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`) -======= const { RichEmbed } = require('discord.js'); let user; if (!msg.mentions.members.first()) { @@ -30,7 +14,6 @@ exports.run = async (bot, msg) => { .addField('Account Creation Date', user.user.createdAt) .addField('Join Guild Date', user.joinedAt) .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`) ->>>>>>> f6c8e529eb06a3d1121feeebb5de6c97eefbc571 ); }; -- cgit v1.2.3