Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-05-14 06:56:18 +08:00
parent ec2b47fa14
commit dd5e6df3ae
13 changed files with 17 additions and 18 deletions

View File

@@ -5,6 +5,7 @@ on:
branches:
- 'dev/0.6-forge'
- 'dev/0.7-forge'
- 'dev/0.8'
jobs:
build: