From 6f0b6b1f02d2d6d6720dd17ccf274f9712aeaa69 Mon Sep 17 00:00:00 2001
From: Travis CI <amishshah.2k@gmail.com>
Date: Mon, 13 Aug 2018 14:20:58 +0000
Subject: [PATCH] Webpack build for branch 11.4-dev:
 3021e5ce7fc5208585ff4bac417198619a31e562

---
 discord.11.4-dev.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/discord.11.4-dev.js b/discord.11.4-dev.js
index ec60af5c..2390fc64 100644
--- a/discord.11.4-dev.js
+++ b/discord.11.4-dev.js
@@ -8253,11 +8253,11 @@ class GuildChannel extends Channel {
     };
   }
 
-  /* eslint-disable max-len */
   /**
    * Replaces the permission overwrites for a channel
    * @param {Object} [options] Options
-   * @param {Array<PermissionOverwrites|ChannelCreationOverwrites>|Collection<Snowflake, ChannelCreationOverwrites>} [options.overwrites] Permission overwrites
+   * @param {ChannelCreationOverwrites[]|Collection<Snowflake, PermissionOverwrites>} [options.overwrites]
+   * Permission overwrites
    * @param {string} [options.reason] Reason for updating the channel overwrites
    * @returns {Promise<GuildChannel>}
    * @example
@@ -8275,7 +8275,6 @@ class GuildChannel extends Channel {
     return this.edit({ permissionOverwrites: overwrites, reason })
       .then(() => this);
   }
-  /* eslint-enable max-len */
 
   /**
    * An object mapping permission flags to `true` (enabled), `null` (unset) or `false` (disabled).
@@ -8377,6 +8376,9 @@ class GuildChannel extends Channel {
    * @property {boolean} [nsfw] Whether the channel is NSFW
    * @property {number} [bitrate] The bitrate of the voice channel
    * @property {number} [userLimit] The user limit of the channel
+   * @property {string} [parent] The parent ID of the channel
+   * @property {ChannelCreationOverwrites[]|Collection<Snowflake, PermissionOverwrites>} [overwrites]
+   * Overwrites of the channel
    */
 
   /**
@@ -9730,17 +9732,16 @@ class Guild {
     return this.edit({ explicitContentFilter }, reason);
   }
 
-  /* eslint-disable max-len */
   /**
    * Edits the setting of the default message notifications of the guild.
-   * @param {DefaultMessageNotifications|number} defaultMessageNotifications The new setting for the default message notifications
+   * @param {DefaultMessageNotifications|number} defaultMessageNotifications
+   * The new setting for the default message notifications
    * @param {string} [reason] Reason for changing the setting of the default message notifications
    * @returns {Promise<Guild>}
    */
   setDefaultMessageNotifications(defaultMessageNotifications, reason) {
     return this.edit({ defaultMessageNotifications }, reason);
   }
-  /* eslint-enable max-len */
 
   /**
    * Edit the name of the guild.
@@ -9984,7 +9985,7 @@ class Guild {
   }
 
   /**
-   * Can be used to overwrite permissions when creating a channel or replacing overwrites.
+   * Overwrites to use when creating a channel or replacing overwrites
    * @typedef {Object} ChannelCreationOverwrites
    * @property {PermissionResolvable} [allow] The permissions to allow
    * **(deprecated)**
@@ -9992,14 +9993,14 @@ class Guild {
    * @property {PermissionResolvable} [deny] The permissions to deny
    * **(deprecated)**
    * @property {PermissionResolvable} [denied] The permissions to deny
-   * @property {RoleResolvable|UserResolvable} id ID of the role or member this overwrite is for
+   * @property {GuildMemberResolvable|RoleResolvable} memberOrRole Member or role this overwrite is for
    */
 
   /**
    * Creates a new channel in the guild.
    * @param {string} name The name of the new channel
    * @param {string} [type='text'] The type of the new channel, either `text` or `voice` or `category`
-   * @param {Array<PermissionOverwrites|ChannelCreationOverwrites>} [overwrites] Permission overwrites
+   * @param {ChannelCreationOverwrites[]|Collection<Snowflake, PermissionOverwrites>} [overwrites] Permission overwrites
    * @param {string} [reason] Reason for creating this channel
    * @returns {Promise<CategoryChannel|TextChannel|VoiceChannel>}
    * @example