fix merging

This commit is contained in:
2024-06-16 14:49:46 +08:00
3 changed files with 53 additions and 32 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ aio/.idea/
aio/code/__pycache__/
aio/package/
aio/venv
aio/__pycache__/