rebase

mozilla-mobile · Nov 4, 2024 · bf495f3 · bf495f3
1 parent ba0ae1d
commit bf495f3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/firefox-ios/Client/Redux/GlobalState/AppState.swift b/firefox-ios/Client/Redux/GlobalState/AppState.swift
@@ -64,11 +64,8 @@ let middlewares = [
     TabManagerMiddleware().tabsPanelProvider,
     ThemeManagerMiddleware().themeManagerProvider,
     ToolbarMiddleware().toolbarProvider,
-<<<<<<< HEAD
     SearchEngineSelectionMiddleware().searchEngineSelectionProvider,
-=======
     TopSitesMiddleware().topSitesProvider,
->>>>>>> 58ed566cce (Add FXIOS-10165 [Homepage] Add initial Top Sites Section)
     TrackingProtectionMiddleware().trackingProtectionProvider,
     PasswordGeneratorMiddleware().passwordGeneratorProvider,
     PocketMiddleware().pocketSectionProvider