resolve merge conflict

legumeinfo · Sep 7, 2023 · 2e110bc · 2e110bc
2 parents 68d43dc + 1ab4178
commit 2e110bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/eslint-prettier-on-pr.yml b/.github/workflows/eslint-prettier-on-pr.yml
@@ -5,7 +5,7 @@ on:
  branches:
  - main
 jobs:
- build:
+ format-and-lint:
  runs-on: ubuntu-latest
  permissions:
  # Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.