From 12a193474bb8bc018ce51468f41f6a6ede0425e3 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Mon, 21 Apr 2025 11:32:01 -0400 Subject: [PATCH] [PM-19814] Fix merge conflict --- apps/browser/src/popup/app-routing.module.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index d67b166482c..f2e9af72ffd 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -64,6 +64,10 @@ import { BlockedDomainsComponent } from "../autofill/popup/settings/blocked-doma import { ExcludedDomainsComponent } from "../autofill/popup/settings/excluded-domains.component"; import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component"; import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component"; +import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component"; +import { PhishingLandingIcon } from "../phishing-detection/images/phishing-landing-icon"; +import { LearnMoreComponent } from "../phishing-detection/pages/learn-more-component"; +import { PhishingWarning } from "../phishing-detection/pages/phishing-warning"; import BrowserPopupUtils from "../platform/popup/browser-popup-utils"; import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service"; import { CredentialGeneratorHistoryComponent } from "../tools/popup/generator/credential-generator-history.component";