wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clmcgrath/flickity-definitions' of https://github.com/clmcgrath/DefinitelyTyped into clmcgrath/flickity-definitions

Browse Source 
# Conflicts:
#	flickity/FlickityEvents.ts
#	flickity/flickity-tests.ts
#	flickity/flickity.d.ts
This commit is contained in:
Chris McGrath
2016-02-18 00:53:04 -05:00
parent 9ee7ad71cc 6aea981d4b
commit c98e44f808
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flickity/FlickityEvents.ts
+4
View File
@@ -1,6 +1,10 @@
// Event Constants for Flickity v1.1.1
// Project: http://flickity.metafizzy.co/
<<<<<<< HEAD
// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
=======
// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
// Definitions: https://github.com/clmcgrath/
class FlickityEvents {
flickity/flickity-tests.ts
+4
View File
@@ -1,6 +1,10 @@
// Type definition tests for Flickity v1.1.1
// Project: http://flickity.metafizzy.co/
<<<<<<< HEAD
// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
=======
// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
// Definitions: https://github.com/clmcgrath/
///<reference path="../jquery/jquery.d.ts"/>
flickity/flickity.d.ts
Vendored
+4
View File
@@ -1,6 +1,10 @@
// Type definitions for Flickity v1.1.1
// Project: http://flickity.metafizzy.co/
<<<<<<< HEAD
// Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
=======
// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
// Definitions: https://github.com/clmcgrath/