mirror of
https://github.com/fsolla/teqo.git
synced 2026-11-13 23:53:05 +00:00
fix: remove leftover conflict markers from ContextSync
This commit is contained in:
parent
ca80da178c
commit
91d51b547d
1 changed files with 0 additions and 8 deletions
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue