Fix merge conflicts, it compiles, but shouldn't work

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2022-01-06 16:03:03 +08:00
parent 158185d374
commit 874671eb7f
24 changed files with 160 additions and 152 deletions

View File

@@ -8,7 +8,6 @@ on:
- 'dev/0.8'
- 'dev/0.9'
- 'dev/0.10.0'
- 'dev/0.11.0'
jobs:
build: