Skip to content

Commit

Permalink
Merge branch 'main' into ephys/prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
sequelize-bot[bot] authored Apr 11, 2024
2 parents 70b926e + b47b4cb commit 62d9e54
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/autoupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
app-id: '${{ secrets.SEQUELIZE_BOT_APP_ID }}'
private-key: '${{ secrets.SEQUELIZE_BOT_PRIVATE_KEY }}'
- uses: sequelize/pr-auto-update-and-handle-conflicts@3ff4c1ae3b521ccd0a6bed0de19911d555b7da8d # 1.0.0
- uses: sequelize/pr-auto-update-and-handle-conflicts@257ac5f68859672393e3320495164251140bd801 # 1.0.1
with:
conflict-label: 'conflicted'
conflict-requires-ready-state: 'ready_for_review'
Expand Down

0 comments on commit 62d9e54

Please sign in to comment.