Merge branch 'main' into next15

# Conflicts: # app/layout.tsx
BobDotCom · Nov 1, 2024 · 0f3f457 · 0f3f457
2 parents 7c2f810 + b624452
commit 0f3f457
Show file tree

Hide file tree

Showing 2 changed files with 134 additions and 139 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "@types/react": "npm:[email protected]",
     "@types/react-dom": "npm:[email protected]",
     "autoprefixer": "^10.4.20",
-    "eslint": "^9",
+    "eslint": "^8",
     "eslint-config-next": "15.0.2",
     "postcss": "^8",
     "serve": "^14.2.4",