fix layout

2025-08-11 19:10:46 -05:00
parent 9836b40531
commit b9d85a5520
5 changed files with 15 additions and 32 deletions
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1,8 +1,3 @@
-<<<<<<< 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)