From 4fdaf028d449c5e1f82c49b45a81776b2bbb0934 Mon Sep 17 00:00:00 2001
From: suricata <tomas@suricatingss.xyz>
Date: Sun, 11 Jan 2026 17:42:29 +0000
Subject: [PATCH] commit

---
 nuxt.config.ts |  8 --------
 pnpm-lock.yaml | 15 ---------------
 2 files changed, 23 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index 01c8390..61c3a1e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -3,9 +3,6 @@ import tailwindcss from "@tailwindcss/vite"
 export default defineNuxtConfig({
   compatibilityDate: '2025-07-15',
   devtools: { enabled: true },
-<<<<<<< HEAD
-  modules: [ "@nuxt/ui", "@nuxt/image", "@nuxt/fonts", "@nuxtjs/color-mode"],
-=======
   modules: [
     "@nuxt/ui",
     "@nuxt/image",
@@ -13,13 +10,8 @@ export default defineNuxtConfig({
     "@nuxtjs/color-mode",
     "nuxt-lazytube"
   ],
->>>>>>> fd526e9 (commit)
   css: [ "@/assets/global.css" ],
   vite: {
     plugins: [ tailwindcss() ]
   }
-<<<<<<< HEAD
 })
-=======
-})
->>>>>>> fd526e9 (commit)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fe80812..2cefe7f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,12 +29,9 @@ importers:
       nuxt:
         specifier: ^4.2.2
         version: 4.2.2(@parcel/watcher@2.5.1)(@vue/compiler-sfc@3.5.26)(cac@6.7.14)(db0@0.3.4)(ioredis@5.9.1)(lightningcss@1.30.2)(magicast@0.5.1)(rollup@4.55.1)(terser@5.44.1)(typescript@5.9.3)(vite@7.3.1(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(yaml@2.8.2))(yaml@2.8.2)
-<<<<<<< HEAD
-=======
       nuxt-lazytube:
         specifier: 0.2.5
         version: 0.2.5
->>>>>>> fd526e9 (commit)
       tailwindcss:
         specifier: ^4.1.18
         version: 4.1.18
@@ -3235,12 +3232,9 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-<<<<<<< HEAD
-=======
   nuxt-lazytube@0.2.5:
     resolution: {integrity: sha512-SaAMosZh0otF/zOfeng0lzUd5M10gkC2rwppGDISjno8z1C+mEymwjE8SVbnnsipAxkTy9Qm8umd+GuhFNo/hw==}
 
->>>>>>> fd526e9 (commit)
   nuxt@4.2.2:
     resolution: {integrity: sha512-n6oYFikgLEb70J4+K19jAzfx4exZcRSRX7yZn09P5qlf2Z59VNOBqNmaZO5ObzvyGUZ308SZfL629/Q2v2FVjw==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -4328,12 +4322,9 @@ packages:
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
-<<<<<<< HEAD
-=======
   whatwg-fetch@3.6.20:
     resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
 
->>>>>>> fd526e9 (commit)
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -7857,13 +7848,10 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-<<<<<<< HEAD
-=======
   nuxt-lazytube@0.2.5:
     dependencies:
       whatwg-fetch: 3.6.20
 
->>>>>>> fd526e9 (commit)
   nuxt@4.2.2(@parcel/watcher@2.5.1)(@vue/compiler-sfc@3.5.26)(cac@6.7.14)(db0@0.3.4)(ioredis@5.9.1)(lightningcss@1.30.2)(magicast@0.5.1)(rollup@4.55.1)(terser@5.44.1)(typescript@5.9.3)(vite@7.3.1(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(yaml@2.8.2))(yaml@2.8.2):
     dependencies:
       '@dxup/nuxt': 0.2.2(magicast@0.5.1)
@@ -9148,11 +9136,8 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-<<<<<<< HEAD
-=======
   whatwg-fetch@3.6.20: {}
 
->>>>>>> fd526e9 (commit)
   whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3