From 5c99379ba095b9556095147278d2260e359a5462 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 1 Aug 2026 08:16:26 +0000 Subject: [PATCH] fix(B94): remove leftover rebase conflict markers --- .../shared/WizardMunicipalitySearchStep.tsx | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/components/campaign/shared/WizardMunicipalitySearchStep.tsx b/src/components/campaign/shared/WizardMunicipalitySearchStep.tsx index 25837c5d..c2eb9794 100644 --- a/src/components/campaign/shared/WizardMunicipalitySearchStep.tsx +++ b/src/components/campaign/shared/WizardMunicipalitySearchStep.tsx @@ -164,25 +164,10 @@ export const WizardMunicipalitySearchStep = ({ }, [continuityReady, continuitySlugs, nearestMunicipality, results]) const showEmpty = -<<<<<<< HEAD query.isActive && results.status === 'success' && results.mode === 'search' && results.municipalities.length === 0 -======= - query.isActive && results.status === 'success' && results.municipalities.length === 0 - - const displayMunicipalities = useMemo((): HomeSearchMunicipalityHit[] => { - if (searchMode) { - return results.status === 'success' ? results.municipalities : [] - } - - if (!suggestMode) return [] - - const serverHits = results.status === 'success' ? results.municipalities : [] - return mergeWizardMunicipalitySuggestions(serverHits, nearestMunicipality) - }, [nearestMunicipality, results, searchMode, suggestMode]) ->>>>>>> 7ede30b (fix(B94): restore typed search results in wizard municipality step) return (