Skip to content

N
nexpie-grafana-theme
Commit fabc6f42 by Hugo Häggmark Committed by GitHub
Options

Fix: Fixes merge conflict (#17568)

parent 9e9fdb9c
Showing with 0 additions and 1 deletions
public/app/features/explore/AdHocFilterField.test.tsx
...@@ -4,7 +4,6 @@ import { DataSourceApi } from '@grafana/ui'; ...@@ -4,7 +4,6 @@ import { DataSourceApi } from '@grafana/ui';
import { AdHocFilterField, DEFAULT_REMOVE_FILTER_VALUE } from './AdHocFilterField'; import { AdHocFilterField, DEFAULT_REMOVE_FILTER_VALUE } from './AdHocFilterField';
import { AdHocFilter } from './AdHocFilter'; import { AdHocFilter } from './AdHocFilter';
import { DataSourceApi } from '@grafana/ui';
import { MockDataSourceApi } from '../../../test/mocks/datasource_srv'; import { MockDataSourceApi } from '../../../test/mocks/datasource_srv';
describe('<AdHocFilterField />', () => { describe('<AdHocFilterField />', () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment