From 134d2895f00ae9b1de6f1b862ce6a6309ccb8c8e Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Sun, 31 Dec 2023 23:11:15 +0100
Subject: [PATCH] fix: merge conflict

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 071812e474..01bc4804bc 100644
--- 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",