Home Explore Help
Register Sign In
oscarleiva
/
energylink
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix: Fixes merge conflict (#17568)

Hugo Häggmark 6 years ago
parent
9e9fdb9cf1
commit
fabc6f4241
1 changed files with 0 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      public/app/features/explore/AdHocFilterField.test.tsx

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