Conflicts:
	jquery/jquery.d.ts
This commit is contained in:
Vincent Bortone
2013-01-22 17:55:40 -05:00
+1 -1
View File
@@ -88,7 +88,7 @@ interface JQueryPromise {
progress(...progressCallbacks: any[]): 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;
then(doneCallbacks: any, failCallbacks?: any, progressCallbacks?: any): JQueryPromise;
}
/*