From aa0cc4e15af934f987e0d06f1f635db49bb0529b Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 05:27:01 +0000
Subject: [PATCH] test: resolve searchStaffMunicipalityHits conflict after
 rebase

---
 src/lib/campaignQuickActionRegistry.ts            | 4 ++--
 tests/int/searchStaffMunicipalityHits.int.spec.ts | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index c8fad4c3..6305b5c5 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,19 +1,19 @@
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
+import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
+import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
-import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
   parseOrganizationQuickActionSurface,
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
-import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
diff --git a/tests/int/searchStaffMunicipalityHits.int.spec.ts b/tests/int/searchStaffMunicipalityHits.int.spec.ts
index 46022c18..500b8553 100644
--- a/tests/int/searchStaffMunicipalityHits.int.spec.ts
+++ b/tests/int/searchStaffMunicipalityHits.int.spec.ts
@@ -49,11 +49,7 @@ describe('searchStaffMunicipalityHits (B60)', () => {
 
     const administered = await fixtures.getMunicipality()
     let other = await fixtures.getMunicipality()
-<<<<<<< HEAD
     for (let attempt = 0; attempt < 30; attempt++) {
-=======
-    for (let attempt = 0; attempt < 24; attempt += 1) {
->>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
       try {
         distinctWordStartQuery(other.name, administered.name)
         distinctWordStartQuery(administered.name, other.name)
@@ -61,15 +57,10 @@ describe('searchStaffMunicipalityHits (B60)', () => {
       } catch {
         other = await fixtures.getMunicipality()
       }
-<<<<<<< HEAD
       if (attempt === 29) {
         throw new Error('could not allocate two municipalities with distinct word-start queries')
       }
     }
-    await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
-=======
-    }
->>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
 
     const otherQuery = distinctWordStartQuery(other.name, administered.name)
     const administeredQuery = distinctWordStartQuery(administered.name, other.name)