From d0e842e2f96893b86a2ea2d1e0a4dc504379cd69 Mon Sep 17 00:00:00 2001
From: Marc Sallin <marc.sallin@outlook.com>
Date: Thu, 25 Jun 2015 00:21:40 +0200
Subject: [PATCH] Q: Support for the Q.noConflict() method.

---
 q/Q.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/q/Q.d.ts b/q/Q.d.ts
index 2a239dc18e..8453d5e73d 100644
--- a/q/Q.d.ts
+++ b/q/Q.d.ts
@@ -316,6 +316,13 @@ declare module Q {
      * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
      */
     export function resolve<T>(object: T): Promise<T>;
+
+	/**
+	 * Resets the global "Q" variable to the value it has before Q was loaded.
+	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
+	 * @returns { The last version of Q. } 
+	 */
+	export function noConflict(): typeof Q;
 }
 
 declare module "q" {