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

fix: remove leftover merge conflict markers in app layout

Browse source
This commit is contained in:
Cursor Agent 2026-07-31 02:36:32 +00:00
parent f1759c57a9
commit 118544cbaa
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/(campaign)/campanha/(app)/layout.tsx
View file

@ -11,10 +11,7 @@ import {
} from '@/components/campaign/shell/BiometricEnrollmentToast'
import { CampaignAppScrollChrome } from '@/components/campaign/shell/CampaignAppScrollChrome'
import { CampaignMobileTopBar } from '@/components/campaign/shell/CampaignMobileTopBar'
<<<<<<< HEAD
import { CampaignNotificationBellSlot } from '@/components/campaign/shell/CampaignNotificationBellSlot'
=======
>>>>>>> a9fe297 (style: prettier)
import { CampaignQuickActionContextProvider } from '@/components/campaign/shell/CampaignQuickActionContext'
import { CampaignSidebar } from '@/components/campaign/shell/CampaignSidebar'
import { CampaignSidebarViewportDefault } from '@/components/campaign/shell/CampaignSidebarViewportDefault'
@ -80,7 +77,9 @@ export default async function CampaignAppLayout({ children }: { children: React.
<CampaignWizardChromeProvider>
<CampaignQuickActionContextProvider>
<CampaignListPendingBoundary>
<CampaignMobileTopBar notificationBell={<CampaignNotificationBellSlot user={user} />} />
<CampaignMobileTopBar
notificationBell={<CampaignNotificationBellSlot user={user} />}
/>
<header className="hidden min-h-11 shrink-0 items-center gap-2 border-b border-border px-4 md:flex print:hidden">
<SidebarTrigger />
<div className="ml-auto">