From 3b3653433fb543796914f6f39c4cc7de4136e3f3 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 25 Aug 2021 12:33:16 +0300 Subject: [PATCH 1/2] updated commons --- src/lib/filtering/popup-filter/popup-filter.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/filtering/popup-filter/popup-filter.component.ts b/src/lib/filtering/popup-filter/popup-filter.component.ts index cf3ffc1..a0fd305 100644 --- a/src/lib/filtering/popup-filter/popup-filter.component.ts +++ b/src/lib/filtering/popup-filter/popup-filter.component.ts @@ -3,6 +3,7 @@ import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox'; import { BehaviorSubject, combineLatest, Observable, pipe } from 'rxjs'; import { delay, distinctUntilChanged, map, shareReplay } from 'rxjs/operators'; import { any } from '../../utils/operators'; +<<<<<<< HEAD import { handleCheckedValue } from '../filter-utils'; import { FilterService } from '../filter.service'; import { FilterGroup } from '../models/filter-group.model'; From 007aedbe09c80fce4ca44a1b00d669685a9e1d36 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 25 Aug 2021 12:40:19 +0300 Subject: [PATCH 2/2] filter fix --- src/lib/filtering/popup-filter/popup-filter.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/filtering/popup-filter/popup-filter.component.ts b/src/lib/filtering/popup-filter/popup-filter.component.ts index a0fd305..cf3ffc1 100644 --- a/src/lib/filtering/popup-filter/popup-filter.component.ts +++ b/src/lib/filtering/popup-filter/popup-filter.component.ts @@ -3,7 +3,6 @@ import { MAT_CHECKBOX_DEFAULT_OPTIONS } from '@angular/material/checkbox'; import { BehaviorSubject, combineLatest, Observable, pipe } from 'rxjs'; import { delay, distinctUntilChanged, map, shareReplay } from 'rxjs/operators'; import { any } from '../../utils/operators'; -<<<<<<< HEAD import { handleCheckedValue } from '../filter-utils'; import { FilterService } from '../filter.service'; import { FilterGroup } from '../models/filter-group.model';