IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 16:27:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fixes merge conflict (#17568)

Browse Source
This commit is contained in:
Hugo Häggmark 2019-06-13 12:46:10 +02:00 committed by GitHub
parent 9e9fdb9cf1
commit fabc6f4241
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/explore/AdHocFilterField.test.tsx
View File

@ -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 />', () => {