Finish merging styled components

calblueprint · Sep 30, 2024 · 715460c · 715460c
1 parent f2cd9f3
commit 715460c
Show file tree

Hide file tree

Showing 3 changed files with 4,780 additions and 7 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -4,8 +4,5 @@
 
 README.md
 package-lock.json
-<<<<<<< HEAD
-=======
 pnpm-lock.yaml
->>>>>>> template/styled-components
 next-env.d.ts
diff --git a/next.config.mjs b/next.config.mjs
@@ -1,12 +1,8 @@
 /** @type {import('next').NextConfig} */
-<<<<<<< HEAD
-const nextConfig = {};
-=======
 const nextConfig = {
   compiler: {
     styledComponents: true,
   },
 };
->>>>>>> template/styled-components
 
 export default nextConfig;