From efc67e63d92187669026441e7c43c68a1f2ea795 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 17:36:16 -0400
Subject: [PATCH] [angular][jquery] Fix merge issue with cssPropertySetter.

---
 types/angular/index.d.ts   | 5 ++++-
 types/angular/jqlite.d.ts  | 4 +++-
 types/jquery/v1/index.d.ts | 4 +++-
 types/jquery/v2/index.d.ts | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 4f8d55f9dc..3683c1aed6 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for Angular JS 1.6
 // Project: http://angularjs.org
-// Definitions by: Diego Vilar <http://github.com/diegovilar>, Georgii Dolzhykov <http://github.com/thorn0>, Caleb St-Denis <https://github.com/calebstdenis>
+// Definitions by: Diego Vilar <http://github.com/diegovilar>
+//                 Georgii Dolzhykov <http://github.com/thorn0>
+//                 Caleb St-Denis <https://github.com/calebstdenis>
+//                 Leonard Thieu <https://github.com/leonard-thieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/angular/jqlite.d.ts b/types/angular/jqlite.d.ts
index 36509143fa..016411c848 100644
--- a/types/angular/jqlite.d.ts
+++ b/types/angular/jqlite.d.ts
@@ -796,7 +796,9 @@ interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObjec
 /**
  * The interface used to specify the properties parameter in css()
  */
-type cssPropertySetter = (index: number, value?: string) => string | number;
+interface cssPropertySetter {
+    (index: number, value?: string): string | number;
+}
 interface JQueryCssProperties {
     [propertyName: string]: string | number | cssPropertySetter;
 }
diff --git a/types/jquery/v1/index.d.ts b/types/jquery/v1/index.d.ts
index a3c2d42979..ee66781019 100644
--- a/types/jquery/v1/index.d.ts
+++ b/types/jquery/v1/index.d.ts
@@ -702,7 +702,9 @@ interface JQueryCoordinates {
 /**
  * The interface used to specify the properties parameter in css()
  */
-type cssPropertySetter = (index: number, value?: string) => string | number;
+interface cssPropertySetter {
+    (index: number, value?: string): string | number;
+}
 interface JQueryCssProperties {
     [propertyName: string]: string | number | cssPropertySetter;
 }
diff --git a/types/jquery/v2/index.d.ts b/types/jquery/v2/index.d.ts
index b01e4ceda7..9d30f12c38 100644
--- a/types/jquery/v2/index.d.ts
+++ b/types/jquery/v2/index.d.ts
@@ -702,7 +702,9 @@ interface JQueryCoordinates {
 /**
  * The interface used to specify the properties parameter in css()
  */
-type cssPropertySetter = (index: number, value?: string) => string | number;
+interface cssPropertySetter {
+    (index: number, value?: string): string | number;
+}
 interface JQueryCssProperties {
     [propertyName: string]: string | number | cssPropertySetter;
 }