Skip to content

Commit b2b8f44

Browse files
committed
dependabot: fix indentation
1 parent 71835cc commit b2b8f44

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

.github/workflows/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ jobs:
3131
git commit -m "updated botocore"
3232
git push https://rsteube-bot:${GITHUB_TOKEN}@github.com/carapace-sh/carapace-aws.git HEAD:${GITHUB_HEAD_REF}
3333
fi
34+
<<<<<<< Updated upstream
35+
||||||| Stash base
36+
env:
37+
DEPENDABOT_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}
38+
=======
39+
env:
40+
DEPENDABOT_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}
41+
>>>>>>> Stashed changes
3442

3543
auto-merge:
3644
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)