From b8f2a0df2ce52e7667a40d5e40a23d5fa211ba22 Mon Sep 17 00:00:00 2001
From: Diullei Gomes <diullei@gmail.com>
Date: Sun, 31 Mar 2013 12:13:16 -0300
Subject: [PATCH] resolved conflicts to pullrequest #387

---
 jquery/jquery.d.ts     | 3 +--
 knockout/knockout.d.ts | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index cfde730969..96bc6deb2a 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -89,6 +89,7 @@ interface JQueryPromise {
     state(): string;
     pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise;
     then(doneCallbacks: any, failCallbacks?: any, progressCallbacks?: any): JQueryPromise;
+    promise(target?): JQueryPromise;
 }
 
 /*
@@ -97,8 +98,6 @@ interface JQueryPromise {
 interface JQueryDeferred extends JQueryPromise {
     notify(...args: any[]): JQueryDeferred;
     notifyWith(context: any, ...args: any[]): JQueryDeferred;
-
-    promise(target? ): JQueryPromise;
     reject(...args: any[]): JQueryDeferred;
     rejectWith(context:any, ...args: any[]): JQueryDeferred;
     resolve(...args: any[]): JQueryDeferred;
diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index 19cf7ba336..9a55cbe2a7 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -67,12 +67,7 @@ interface KnockoutComputedStatic {
     (options?: any): KnockoutComputed;
 }
 
-interface KnockoutComputed extends KnockoutComputedFunctions {
-    (): any;
-    (value: any): void;
-
-    subscribe(callback: (newValue: any) => void, target?:any, topic?: string): KnockoutSubscription;
-    notifySubscribers(valueToWrite, topic?: string);
+interface KnockoutComputed extends KnockoutObservableAny, KnockoutComputedFunctions {
 }
 
 interface KnockoutObservableArrayStatic {