NikolaRHristov · NikolaRHristov · commit 22858a362dc1 · 2025-07-22T12:17:34.000+03:00
diff --git a/.github/Update.md b/.github/Update.md
@@ -1 +1 @@
-Update: Sat Jul  5 00:59:38 UTC 2025
+Update: Tue Jul 22 01:05:34 UTC 2025
diff --git a/package.json b/package.json
@@ -44,7 +44,11 @@
 		"@playform/pipe": "0.1.3",
 		"@types/csso": "5.0.4",
 		"@types/html-minifier-terser": "7.0.2",
+<<<<<<< HEAD
 		"astro": "^5.11.2",
+=======
+		"astro": "^5.12.0",
+>>>>>>> c903587a249f3739703cf3d0db57b39710724a7c
 		"commander": "14.0.0",
 		"csso": "5.0.5",
 		"deepmerge-ts": "7.1.5",

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Update: Sat Jul 5 00:59:38 UTC 2025`
	`1`	`+Update: Tue Jul 22 01:05:34 UTC 2025`