From 3c4d82050633b8fba9c8a6cbb4b8b16fb7bbd66b Mon Sep 17 00:00:00 2001
From: Travis CI <amishshah.2k@gmail.com>
Date: Thu, 24 Nov 2016 16:23:50 +0000
Subject: [PATCH] Webpack build: ac64f8bd233079f757e751e4f92c50d6ae8aa37e

---
 discord.indev.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/discord.indev.js b/discord.indev.js
index 134b1b23..a921b464 100644
--- a/discord.indev.js
+++ b/discord.indev.js
@@ -737,7 +737,7 @@ class Collection extends Map {
 
   /**
    * Combines this collection with others into a new collection. None of the source collections are modified.
-   * @param {Collection} collections Collections to merge (infinite/rest argument, not an array)
+   * @param {...Collection} collections Collections to merge
    * @returns {Collection}
    * @example const newColl = someColl.concat(someOtherColl, anotherColl, ohBoyAColl);
    */
@@ -11159,7 +11159,7 @@ class Client extends EventEmitter {
    * Sets a timeout that will be automatically cancelled if the client is destroyed.
    * @param {Function} fn Function to execute
    * @param {number} delay Time to wait before executing (in milliseconds)
-   * @param {args} args Arguments for the function (infinite/rest argument, not an array)
+   * @param {...*} args Arguments for the function
    * @returns {Timeout}
    */
   setTimeout(fn, delay, ...args) {
@@ -11184,7 +11184,7 @@ class Client extends EventEmitter {
    * Sets an interval that will be automatically cancelled if the client is destroyed.
    * @param {Function} fn Function to execute
    * @param {number} delay Time to wait before executing (in milliseconds)
-   * @param {args} args Arguments for the function (infinite/rest argument, not an array)
+   * @param {...*} args Arguments for the function
    * @returns {Timeout}
    */
   setInterval(fn, delay, ...args) {