Task/fix main merge - Githubissues

HicServices / RDMP

Research Data Management Platform (RDMP) is an open source application for the loading,linking,anonymisation and extraction of datasets stored in relational databases.

https://github.com/HicServices/RDMP#research-data-management-platform

GNU General Public License v3.0

36 stars 16 forks source link

Task/fix main merge #1841

Closed JFriel closed 4 months ago

JFriel commented 4 months ago

Proposed Change

Fix merge conflict when merging main into develop

Type of change

What types of changes does your code introduce? Tick all that apply.

[ ] Bugfix (non-breaking change which fixes an issue)
[ ] New Feature (non-breaking change which adds functionality)
[ ] Breaking Change (fix or feature that would cause existing functionality to not work as expected)
[ ] Documentation-Only Update
[x] Other (if none of the other choices apply)

Checklist

By opening this PR, I confirm that I have:

[x] Ensured that the PR branch is in sync with the target branch (i.e. it is automatically merge-able)
[ ] Created or updated any tests if relevant
[ ] Have validated this change against the Test Plan
[ ] Requested a review by one of the repository maintainers
[ ] Have written new documentation or updated existing documentation to detail any new or updated functionality and how to use it
[ ] Have added an entry into the changelog