Skip to content
Snippets Groups Projects
Commit 134d2895 authored by Marie's avatar Marie
Browse files

fix: merge conflict

parent 10222804
No related branches found
No related tags found
1 merge request!486bump `devel` version
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
package.json
+ 1
− 1
View file @ 134d2895
{
"name": "sharkey",
"version": "2023.11.2",
"version": "2023.12.0",
"codename": "shonk",
"repository": {
"type": "git",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment