From 25302ce07db617119c45836d1fc0767b60842f8d Mon Sep 17 00:00:00 2001 From: gaurav patel <100828173+GauravD2t@users.noreply.github.com> Date: Fri, 16 Feb 2024 09:29:42 +0530 Subject: [PATCH] resolve conflict --- src/config/app-config.interface.ts | 2 -- src/environments/environment.test.ts | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 393b0150c4e..7b6cd5851f6 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -23,8 +23,6 @@ import { HomeConfig } from './homepage-config.interface'; import { MarkdownConfig } from './markdown-config.interface'; import { FilterVocabularyConfig } from './filter-vocabulary-config'; import { DiscoverySortConfig } from './discovery-sort.config'; -import { QualityAssuranceConfig } from './quality-assurance.config'; - import { QualityAssuranceConfig } from './quality-assurance.config'; import { SearchConfig } from './search-page-config.interface'; interface AppConfig extends Config { diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 352e9acf7bc..8ea3061ca96 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -321,8 +321,8 @@ export const environment: BuildConfig = { } ], - suggestion: [] - ], + suggestion: [], + search: { advancedFilters: { enabled: false,