No commit message

SouqRs · Jan 15, 2025 · b300949 · b300949
1 parent 4517137
commit b300949
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -29,11 +29,7 @@
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.10",
 		"@tailwindcss/typography": "0.5.16",
-<<<<<<< HEAD
 		"astro": "5.1.6",
-=======
-		"astro": "5.1.5",
->>>>>>> 4762acebf092d7df2081940fa65f6f81ee56099c
 		"astro-capo": "0.0.1",
 		"astrojs-service-worker": "2.0.0",
 		"autoprefixer": "10.4.20",