mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-22 16:03:09 +02:00
fix: merge conflict
This commit is contained in:
parent
1022280465
commit
134d2895f0
1 changed files with 1 additions and 1 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "sharkey",
|
||||
"version": "2023.11.2",
|
||||
"version": "2023.12.0",
|
||||
"codename": "shonk",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
Loading…
Reference in a new issue