From 40130c1cc50959274d564aaa06df187cb1e43758 Mon Sep 17 00:00:00 2001
From: Alexander Lindsay <aml.lindsay@gmail.com>
Date: Mon, 22 Feb 2016 17:55:54 -0800
Subject: [PATCH] Switched to using a union type

Changed T to T | MithrilPromise<T> in the MithrilPromise and
MithrilPromiseProperty definitions
---
 mithril.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mithril.d.ts b/mithril.d.ts
index 4e0c06a0..f023b25a 100644
--- a/mithril.d.ts
+++ b/mithril.d.ts
@@ -658,7 +658,7 @@ declare module _mithril {
 	*
 	* @see m.prop which returns objects that implement this interface.
 	*/
-	interface MithrilPromiseProperty<T> extends MithrilPromise<MithrilPromise<T>>,
+	interface MithrilPromiseProperty<T> extends MithrilPromise<T | MithrilPromise<T>>,
 			MithrilProperty<MithrilPromise<T>> {
 		/**
 		* Gets the contained promise.
@@ -747,7 +747,7 @@ declare module _mithril {
 	/**
 	* This represents a Mithril promise object.
 	*/
-	interface MithrilPromise<T> extends Thennable<T>, MithrilProperty<T> {
+	interface MithrilPromise<T> extends Thennable<T>, MithrilProperty<T | MithrilPromise<T>> {
 		/**
 		* Chain this promise with a simple success callback, propogating
 		* rejections.