fix: merge conflict

2023-12-31 23:11:15 +01:00 · 2023-12-31 23:11:15 +01:00 · 134d2895f0
parent 1022280465
commit 134d2895f0
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "sharkey",
-	"version": "2023.11.2",
+	"version": "2023.12.0",
 	"codename": "shonk",
 	"repository": {
 		"type": "git",