Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump cookiecutter template to f3bf98 #334

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Bump cookiecutter template to f3bf98 #334

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17d52c2
Bump cookiecutter template to f3bf98
RKIMetadataExchange Nov 18, 2024
314d4a7
Update dependency wheel to v0.45.0 (#335)
RKIMetadataExchange Nov 18, 2024
d899cda
Merge branch 'main' into cruft/cookiecutter-template-f3bf98
cutoffthetop Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into cruft/cookiecutter-template-f3bf98 
Signed-off-by: Nicolas Drebenstedt <[email protected]>
  • Loading branch information
@cutoffthetop
cutoffthetop authored Nov 18, 2024
commit d899cda25427db2fe42f66d13d4e27a2d2cc19b1
6 changes: 1 addition & 5 deletions .github/workflows/renovatebot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ jobs:
fetch-depth: 1

- name: Run renovatebot
<<<<<<< ours
uses: renovatebot/[email protected]
=======
uses: renovatebot/[email protected]
>>>>>>> theirs
uses: renovatebot/[email protected]
env:
RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.GPG_SIGNING_KEY }}
RENOVATE_REPOSITORIES: "robert-koch-institut/mex-common"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.