aboutsummaryrefslogtreecommitdiff
path: root/commands
diff options
context:
space:
mode:
authorpokesudenk <thisis@notarealema.il>2018-02-24 19:55:49 -0500
committerpokesudenk <thisis@notarealema.il>2018-02-24 19:55:49 -0500
commite9f85ec2d5ac613950e93674b8f79d8018d08dc9 (patch)
tree90560f0e32623a94218a0c30458f67fae7fb732c /commands
parent52704755a49176b04b5d7703df2b1ae070acc9a6 (diff)
downloadPokeBot-e9f85ec2d5ac613950e93674b8f79d8018d08dc9.tar.gz
PokeBot-e9f85ec2d5ac613950e93674b8f79d8018d08dc9.tar.bz2
PokeBot-e9f85ec2d5ac613950e93674b8f79d8018d08dc9.zip
vscode fucks files
Diffstat (limited to 'commands')
-rw-r--r--commands/Utility/userinfo.js14
1 files changed, 0 insertions, 14 deletions
diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js
index 96287ac..b5dbef7 100644
--- a/commands/Utility/userinfo.js
+++ b/commands/Utility/userinfo.js
@@ -1,20 +1,6 @@
-<<<<<<< HEAD
-exports.run = async (bot, msg) => {
- const user = msg.mentions.members.first();
- const { RichEmbed } = require('discord.js');
- msg.channel.send(
- new RichEmbed()
- .setTitle(`Information for ${user.user.tag}`)
- .addField('User ID', user.id)
- .addField('Account Creation Date', user.user.createdAt)
- .addField('Join Guild Date', user.joinedAt)
- );
-};
-=======
exports.run = async (bot, msg, args) => {
const Discord = require('discord.js');
const user = msg.mentions.members.first();
->>>>>>> master
exports.conf = {
aliases: ['uinfo', 'userinformation'],