fix: merge conflict

This commit is contained in:
Marie 2023-12-31 23:11:15 +01:00
parent 1022280465
commit 134d2895f0

View file

@ -1,6 +1,6 @@
{
"name": "sharkey",
"version": "2023.11.2",
"version": "2023.12.0",
"codename": "shonk",
"repository": {
"type": "git",