From 9057386b63cdd9d4e7a0fa636e7c9f26a697be25 Mon Sep 17 00:00:00 2001
From: Kristofer Baxter <kristofer@kristoferbaxter.com>
Date: Tue, 15 Jun 2021 06:19:23 -0700
Subject: [PATCH] Accidental left over merge

---
 .../0.1/amp-inline-gallery-thumbnails.js               | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
index 0cd4a98877bf..0ff8b15045a1 100644
--- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
+++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js
@@ -17,20 +17,12 @@
 import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events';
 import {InlineGalleryEvents} from './inline-gallery-events';
 import {createCustomEvent} from '../../../src/event-helper';
-<<<<<<< HEAD
-import {dict} from '../../../src/core/types/object';
-import {htmlFor} from '../../../src/core/dom/static-template';
-import {isLayoutSizeDefined} from '../../../src/layout';
-import {matches, scopedQuerySelector} from '../../../src/core/dom/query';
-import {propagateAttributes} from '../../../src/core/dom/propagate-attributes';
-import {setStyle} from '../../../src/core/dom/style';
-=======
 import {dict} from '#core/types/object';
 import {htmlFor} from '#core/dom/static-template';
 import {isLayoutSizeDefined} from '#core/dom/layout';
 import {matches, scopedQuerySelector} from '#core/dom/query';
+import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {setStyle} from '#core/dom/style';
->>>>>>> bafe128873c59aeb1e77d750c44a4f53aed8d713
 
 /**
  * Renders a carousel of thumbnails for an inline gallery.