From 91d51b547d7b77a4d78fd1ae286492d845ffc56b Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 05:46:51 +0000
Subject: [PATCH] fix: remove leftover conflict markers from ContextSync

---
 .../campaign/shell/CampaignQuickActionContextSync.tsx     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/campaign/shell/CampaignQuickActionContextSync.tsx b/src/components/campaign/shell/CampaignQuickActionContextSync.tsx
index 2eb86b29..251a99a1 100644
--- a/src/components/campaign/shell/CampaignQuickActionContextSync.tsx
+++ b/src/components/campaign/shell/CampaignQuickActionContextSync.tsx
@@ -18,10 +18,6 @@ export const CampaignQuickActionContextSync = ({
   demandSlug,
 }: CampaignQuickActionContext) => {
   const { setContext } = useCampaignQuickActionContext()
-<<<<<<< HEAD
-=======
-  const { activitySlug, demandSlug, leadershipId, municipalitySlug, organizationSlug } = context
->>>>>>> 0837151 (style: Prettier on B82 files)
 
   useEffect(() => {
     setContext({
@@ -33,7 +29,6 @@ export const CampaignQuickActionContextSync = ({
       demandSlug,
     })
     return () => setContext(emptyCampaignQuickActionContext())
-<<<<<<< HEAD
   }, [
     setContext,
     municipalitySlug,
@@ -43,9 +38,6 @@ export const CampaignQuickActionContextSync = ({
     activitySlug,
     demandSlug,
   ])
-=======
-  }, [activitySlug, demandSlug, leadershipId, municipalitySlug, organizationSlug, setContext])
->>>>>>> 0837151 (style: Prettier on B82 files)
 
   return null
 }