Fix: Fixes merge conflict (#17568)

This commit is contained in:
Hugo Häggmark
2019-06-13 12:46:10 +02:00
committed by GitHub
parent 9e9fdb9cf1
commit fabc6f4241
@@ -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 />', () => {