chore: Conflict resolution

This commit is contained in:
Disy
2024-02-19 13:31:57 +08:00
parent d1eef6759c
commit 9b0f2d0983
51 changed files with 385 additions and 556 deletions

View File

@@ -4,7 +4,7 @@
"name": "LLOneBot",
"slug": "LLOneBot",
"description": "LiteLoaderQQNT的OneBotApi",
"version": "3.3.1",
"version": "3.4.0",
"thumbnail": "./icon.png",
"authors": [
{