Merge remote-tracking branch 'upstream/main'

# Conflicts: # package.json
CrepesJS · Dec 3, 2023 · 938819b · 938819b
2 parents fae882c + 3e3df96
commit 938819b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,17 @@
 	},
 	"repository": {
 		"type": "git",
+<<<<<<< HEAD
 		"url": "git+https://github.com/CrepesJS/Website.git"
+=======
+		"url": "git+https://github.com/Playform/AstroStarterTemplate.git"
+	},
+	"license": "SEE LICENSE IN LICENSE",
+	"author": {
+		"name": "Nikola Hristov",
+		"email": "[email protected]",
+		"url": "https://nikolahristov.tech"
+>>>>>>> upstream/main
 	},
 	"license": "SEE LICENSE IN LICENSE",
 	"scripts": {