mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
PanelQueryRunner: Use rxjs merge, not lodash merge (#96881)
This commit is contained in:
parent
1a453828d9
commit
a8b6c81d12
@ -1,5 +1,5 @@
|
|||||||
import { cloneDeep, merge, isEqual } from 'lodash';
|
import { cloneDeep, isEqual } from 'lodash';
|
||||||
import { Observable, of, ReplaySubject, Unsubscribable } from 'rxjs';
|
import { Observable, of, ReplaySubject, Unsubscribable, merge } from 'rxjs';
|
||||||
import { map, mergeMap, catchError } from 'rxjs/operators';
|
import { map, mergeMap, catchError } from 'rxjs/operators';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
Loading…
Reference in New Issue
Block a user