Fix: Fixes merge conflict (#17568)

6 years ago · fabc6f4241
parent 9e9fdb9cf1
commit fabc6f4241
1 changed files with 0 additions and 1 deletions
--- 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 />', () => {