merge in new changes

2025-08-11 16:24:43 -05:00
parent a484feb7cd
commit 1dc4ccfbc6
125 changed files with 9304 additions and 20383 deletions
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 /// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
 /// <reference types="astro/content" />
+=======
+/// <reference types="astro/client" />
+/// <reference path="../.astro/types.d.ts" />
+>>>>>>> 184f0c7 (fix path)