No commit message

package.json

@@ -49,10 +49,7 @@
 		"postcss-import": "16.1.0",
 		"postcss-reporter": "7.1.0",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
-=======
 		"swup": "4.7.0",
->>>>>>> Fork/Current
 		"tailwindcss": "*",
 		"typescript": "*",
 		"zod": "*"

tailwind.config.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-const defaultTheme = require("tailwindcss/defaultTheme");
-=======
 import { fontFamily } from "tailwindcss/defaultTheme";
->>>>>>> Fork/Current
 
 export default {
 	content: [
@@ -17,17 +13,12 @@ export default {
 			center: true,
 		},
 		extend: {
-<<<<<<< HEAD
 			fontFamily: {
-				sans: ["Fira Sans", ...defaultTheme.fontFamily.sans],
-=======
+				sans: ["Fira Sans", ...fontFamily.sans],
+			},
 			transitionTimingFunction: {
 				apple: "cubic-bezier(0.21, 0.1, 0.21, 1)",
 			},
-			fontFamily: {
-				sans: ["Albert Sans", ...fontFamily.sans],
->>>>>>> Fork/Current
-			},
 			typography: {
 				DEFAULT: {
 					css: {