wip: snapshot das alterações não commitadas (2026-10-20)

Origem: D:/Documents/Github/OllaHub
Arquivos omitidos (segredos, bancos de dados, logs, >50 MB): 0

app/layout.tsx

@@ -4,13 +4,10 @@ import "./globals.css";
 import { ThemeProvider } from "@/components/theme-provider";
 import { AppUpdaterProvider } from "@/components/app-updater-provider";
 import { KeyboardShortcuts } from "@/components/keyboard-shortcuts";
-<<<<<<< HEAD
 import { DownloadProvider } from "@/contexts/download-context";
 import { GlobalDownloadStatusBar } from "@/components/global-download-status-bar";
 import { OllamaHealthProvider } from "@/contexts/ollama-health-context";
 import { ServiceInterruptionOverlay } from "@/components/ui/service-interruption-overlay";
-=======
->>>>>>> 593efd42e091a845dea82ee6646e027bce1e18c5
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -47,7 +44,6 @@ export default function RootLayout({
           enableSystem
           disableTransitionOnChange
         >
-<<<<<<< HEAD
           <OllamaHealthProvider>
             <DownloadProvider>
               <KeyboardShortcuts />
@@ -57,11 +53,6 @@ export default function RootLayout({
               <ServiceInterruptionOverlay />
             </DownloadProvider>
           </OllamaHealthProvider>
-=======
-          <KeyboardShortcuts />
-          {children}
-          <AppUpdaterProvider />
->>>>>>> 593efd42e091a845dea82ee6646e027bce1e18c5
         </ThemeProvider>
       </body>
     </html>