From 118544cbaa2a6b39a4aef3276e4e8c6b6f0fe7af Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Fri, 31 Jul 2026 02:36:32 +0000
Subject: [PATCH] fix: remove leftover merge conflict markers in app layout

---
 src/app/(campaign)/campanha/(app)/layout.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/(campaign)/campanha/(app)/layout.tsx b/src/app/(campaign)/campanha/(app)/layout.tsx
index 3050c049..640f0501 100644
--- a/src/app/(campaign)/campanha/(app)/layout.tsx
+++ b/src/app/(campaign)/campanha/(app)/layout.tsx
@@ -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">