There was an error while loading. Please reload this page.
1 parent 71835cc commit b2b8f44Copy full SHA for b2b8f44
1 file changed
.github/workflows/dependabot.yml
@@ -31,6 +31,14 @@ jobs:
31
git commit -m "updated botocore"
32
git push https://rsteube-bot:${GITHUB_TOKEN}@github.com/carapace-sh/carapace-aws.git HEAD:${GITHUB_HEAD_REF}
33
fi
34
+<<<<<<< Updated upstream
35
+||||||| Stash base
36
+ env:
37
+ DEPENDABOT_TOKEN: ${{ secrets.DEPENDABOT_TOKEN }}
38
+=======
39
40
41
+>>>>>>> Stashed changes
42
43
auto-merge:
44
runs-on: ubuntu-latest
0 commit comments