From 63d5558899954e865cf515d3ae0b881bcede7f31 Mon Sep 17 00:00:00 2001
From: Travis CI <amishshah.2k@gmail.com>
Date: Thu, 9 Mar 2017 23:34:30 +0000
Subject: [PATCH] Webpack build for branch master:
 14ae7cdf1712ca85b5fc64ea86d6964f1863e406

---
 discord.master.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/discord.master.js b/discord.master.js
index 4d3e7c0e..c7fdb521 100644
--- a/discord.master.js
+++ b/discord.master.js
@@ -1795,7 +1795,7 @@ class Role {
     this.position = data.position;
 
     /**
-     * The evaluated permissions number
+     * The permissions bitfield of the role
      * @type {number}
      */
     this.permissions = data.permissions;
@@ -2843,7 +2843,8 @@ class GuildMember {
   }
 
   /**
-   * Returns `channel.permissionsFor(guildMember)`. Returns evaluated permissions for a member in a guild channel.
+   * Returns `channel.permissionsFor(guildMember)`. Returns permissions for a member in a guild channel,
+   * taking into account roles and permission overwrites.
    * @param {ChannelResolvable} channel Guild channel to use as context
    * @returns {?Permissions}
    */