[angular][jquery] Fix merge issue with cssPropertySetter.

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
 

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;
 }

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;
 }

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;
 }