From ac04abb7a4cdfade3860adc8b091a66826b15a23 Mon Sep 17 00:00:00 2001 From: Leon Sorokin Date: Mon, 25 Nov 2024 12:12:37 -0600 Subject: [PATCH] Revert "PanelQueryRunner: Use rxjs merge, not lodash merge (#96881)" (#96999) This reverts commit a8b6c81d12648c0bf44ab38c0c0be6847c567e6b. --- public/app/features/query/state/PanelQueryRunner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts index 28fa24b30e0..8853a9945a2 100644 --- a/public/app/features/query/state/PanelQueryRunner.ts +++ b/public/app/features/query/state/PanelQueryRunner.ts @@ -1,5 +1,5 @@ -import { cloneDeep, isEqual } from 'lodash'; -import { Observable, of, ReplaySubject, Unsubscribable, merge } from 'rxjs'; +import { cloneDeep, merge, isEqual } from 'lodash'; +import { Observable, of, ReplaySubject, Unsubscribable } from 'rxjs'; import { map, mergeMap, catchError } from 'rxjs/operators'; import {