Skip to content

fixture-updater: change missed in conflict resolution#14433

Merged
valentijnscholten merged 1 commit intoDefectDojo:devfrom
fopina:fixture-updater/merge-conflict
Mar 4, 2026
Merged

fixture-updater: change missed in conflict resolution#14433
valentijnscholten merged 1 commit intoDefectDojo:devfrom
fopina:fixture-updater/merge-conflict

Conversation

@fopina
Copy link
Contributor

@fopina fopina commented Mar 2, 2026

Description

#14336 renamed fixture-updater and #14391 added a new entry in the workflow but before the merge

Probably no conflict was raised due to being independent lines however fixture-updater binary no longer exists.

Quick fix to address that

@fopina fopina requested review from Maffooch and mtesauro as code owners March 2, 2026 22:56
@fopina
Copy link
Contributor Author

fopina commented Mar 2, 2026

cc @valentijnscholten

@Maffooch Maffooch requested review from Jino-T and blakeaowens March 4, 2026 03:16
@valentijnscholten valentijnscholten changed the base branch from dev to master March 4, 2026 09:45
@valentijnscholten valentijnscholten changed the base branch from master to dev March 4, 2026 09:45
@valentijnscholten valentijnscholten added this to the 2.57.0 milestone Mar 4, 2026
@valentijnscholten valentijnscholten merged commit 0cb1b8c into DefectDojo:dev Mar 4, 2026
284 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants