diff options
| author | Unknown <jtsshieh@outlook.com> | 2018-02-24 19:54:33 -0500 |
|---|---|---|
| committer | Unknown <jtsshieh@outlook.com> | 2018-02-24 19:54:33 -0500 |
| commit | 52704755a49176b04b5d7703df2b1ae070acc9a6 (patch) | |
| tree | 11b758851a8f1f5a3fa210be0317cd39398ae3a3 /commands/Utility | |
| parent | 3d56a3964fdd7ce3258475f04693a6ca92a41b34 (diff) | |
| parent | 0f93e19914269a0abeaf5a6d99794acdf604b798 (diff) | |
| download | PokeBot-52704755a49176b04b5d7703df2b1ae070acc9a6.tar.gz PokeBot-52704755a49176b04b5d7703df2b1ae070acc9a6.tar.bz2 PokeBot-52704755a49176b04b5d7703df2b1ae070acc9a6.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'commands/Utility')
| -rw-r--r-- | commands/Utility/userinfo.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js index 0ca3985..96287ac 100644 --- a/commands/Utility/userinfo.js +++ b/commands/Utility/userinfo.js @@ -1,3 +1,4 @@ +<<<<<<< HEAD exports.run = async (bot, msg) => { const user = msg.mentions.members.first(); const { RichEmbed } = require('discord.js'); @@ -9,6 +10,11 @@ exports.run = async (bot, msg) => { .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'], |