mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-08-31 11:40:47 +08:00
last header fix... i hope
This commit is contained in:
@@ -1,10 +1,6 @@
|
||||
// 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 {
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
// 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"/>
|
||||
///<reference path="FlickityEvents.ts"/>
|
||||
///<reference path="flickity.d.ts"/>
|
||||
|
||||
Vendored
-4
@@ -1,10 +1,6 @@
|
||||
// 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/
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user