last header fix... i hope

This commit is contained in:
Chris McGrath
2016-02-18 00:57:23 -05:00
parent c98e44f808
commit bd3dfeac54
3 changed files with 0 additions and 13 deletions
-4
View File
@@ -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 {
-5
View File
@@ -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"/>
-4
View File
@@ -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/