aboutsummaryrefslogtreecommitdiff
path: root/commands/Utility
diff options
context:
space:
mode:
Diffstat (limited to 'commands/Utility')
-rw-r--r--commands/Utility/userinfo.js6
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'],