fsolla/teqo-backup
1
0
Fork 0
mirror of https://github.com/fsolla/teqo.git synced 2026-11-13 23:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve rebase conflict markers in v2 page

Browse source
This commit is contained in:
Cursor Agent 2026-08-03 00:42:58 +00:00
parent 30a5a8a5e3
commit 9325380305
No known key found for this signature in database
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/app/(campaign)/campanha/(app)/municipio/[slug]/v2/page.tsx
View file

@ -36,7 +36,7 @@ export default async function MunicipalityV2Page({ params }: MunicipalityV2PageP
])
let status
<<<<<<< HEAD
let context
let network
let agora
try {
@ -45,19 +45,9 @@ export default async function MunicipalityV2Page({ params }: MunicipalityV2PageP
loadMunicipalityV2NetworkData(payload, user, slug),
loadMunicipalityV2AgoraData(payload, user, slug),
])
<<<<<<< HEAD
;({ status } = statusLoaded)
;({ status, context } = statusLoaded)
network = networkLoaded
agora = agoraLoaded
=======
;({ status } = loaded[0])
network = loaded[1]
=======
let context
try {
;({ status, context } = await loadMunicipalityV2StatusData(payload, user, slug))
>>>>>>> b1786d18 (B151 — FAB secundário no detalhe município v2 (#334))
>>>>>>> f198d718 (B151 — FAB secundário no detalhe município v2 (#334))
} catch (error) {
if (error instanceof MunicipalityNotFoundError) notFound()
throw error