Skip to content
Snippets Groups Projects
Commit f0987e7e authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

fix head conflict

parent 20133d64
No related branches found
No related tags found
2 merge requests!1706merge 2.8.4 to main,!1687Pickup patch changes
Pipeline #16157 canceled
Stage: pull-db
Stage: build
Stage: unit-test
Stage: .post