resolve conflict

aky15

2023-04-12 77eef7169caa601e285c484c4b7b25882764b181

 .github/workflows/main.yml

@@ -5,7 +5,7 @@
      - main
  push:
    branches:
      - dev
      - dev_wjm

jobs:
  docs: