From fabc6f42412ccaee3c930498d23138b8c463d3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Thu, 13 Jun 2019 12:46:10 +0200
Subject: [PATCH] Fix: Fixes merge conflict (#17568)

---
 public/app/features/explore/AdHocFilterField.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/app/features/explore/AdHocFilterField.test.tsx b/public/app/features/explore/AdHocFilterField.test.tsx
index dc18a06ab6f..febf1b73404 100644
--- a/public/app/features/explore/AdHocFilterField.test.tsx
+++ b/public/app/features/explore/AdHocFilterField.test.tsx
@@ -4,7 +4,6 @@ import { DataSourceApi } from '@grafana/ui';
 
 import { AdHocFilterField, DEFAULT_REMOVE_FILTER_VALUE } from './AdHocFilterField';
 import { AdHocFilter } from './AdHocFilter';
-import { DataSourceApi } from '@grafana/ui';
 import { MockDataSourceApi } from '../../../test/mocks/datasource_srv';
 
 describe('<AdHocFilterField />', () => {