From bd3dfeac5424a2c42d769c7ed163e8ee660e85e6 Mon Sep 17 00:00:00 2001 From: Chris McGrath Date: Thu, 18 Feb 2016 00:57:23 -0500 Subject: [PATCH] last header fix... i hope --- flickity/FlickityEvents.ts | 4 ---- flickity/flickity-tests.ts | 5 ----- flickity/flickity.d.ts | 4 ---- 3 files changed, 13 deletions(-) diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts index 6263aef8e..4beb5989b 100644 --- a/flickity/FlickityEvents.ts +++ b/flickity/FlickityEvents.ts @@ -1,10 +1,6 @@ // Event Constants for Flickity v1.1.1 // Project: http://flickity.metafizzy.co/ -<<<<<<< HEAD // Definitions by: Chris McGrath -======= -// Definitions by: [Chris McGrath] ->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db // Definitions: https://github.com/clmcgrath/ class FlickityEvents { diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts index fb03d7e5e..80f6b7310 100644 --- a/flickity/flickity-tests.ts +++ b/flickity/flickity-tests.ts @@ -1,12 +1,7 @@ // Type definition tests for Flickity v1.1.1 // Project: http://flickity.metafizzy.co/ -<<<<<<< HEAD // Definitions by: Chris McGrath -======= -// Definitions by: [Chris McGrath] ->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db // Definitions: https://github.com/clmcgrath/ - /// /// /// diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts index 07bfb9f2d..298a57c0b 100644 --- a/flickity/flickity.d.ts +++ b/flickity/flickity.d.ts @@ -1,10 +1,6 @@ // Type definitions for Flickity v1.1.1 // Project: http://flickity.metafizzy.co/ -<<<<<<< HEAD // Definitions by: Chris McGrath -======= -// Definitions by: [Chris McGrath] ->>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db // Definitions: https://github.com/clmcgrath/