From 9b42283906bd028f1dbfc9a9e36b3b5e2327da15 Mon Sep 17 00:00:00 2001
From: Travis CI <amishshah.2k@gmail.com>
Date: Wed, 1 Mar 2017 09:40:49 +0000
Subject: [PATCH] Webpack build for branch master:
 01d8d32ea936f37821cef7bad623770d87f1b540

---
 discord.master.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/discord.master.js b/discord.master.js
index 6d5127d2..fc340306 100644
--- a/discord.master.js
+++ b/discord.master.js
@@ -2535,9 +2535,19 @@ class GuildMember {
     return permissions.filter(p => !this.hasPermission(p, explicit));
   }
 
+  /**
+   * The data for editing a guild member
+   * @typedef {Object} GuildMemberEditData
+   * @property {string} [nick] The nickname to set for the member
+   * @property {Collection<Snowflake, Role>|Role[]|Snowflake[]} [roles] The roles or role IDs to apply
+   * @property {boolean} [mute] Whether or not the member should be muted
+   * @property {boolean} [deaf] Whether or not the member should be deafened
+   * @property {ChannelResolvable} [channel] Channel to move member to (if they are connected to voice)
+   */
+
   /**
    * Edit a guild member
-   * @param {GuildmemberEditData} data The data to edit the member with
+   * @param {GuildMemberEditData} data The data to edit the member with
    * @returns {Promise<GuildMember>}
    */
   edit(data) {