fix: merge conflicts in Cargo.lock #1796

Job	Run time
build-auditor / build-auditor	1m 54s
build-pyauditor-source / build-pyauditor	4m 43s
sqlx / sqlx	1m 59s
prepare-input-parameters / parameters	1s
build-pyauditor-linux (3.10) / build-pyauditor	4m 46s
build-pyauditor-linux (3.11) / build-pyauditor	4m 52s
build-pyauditor-linux (3.12) / build-pyauditor	4m 45s
build-pyauditor-linux (3.9) / build-pyauditor	4m 46s
build-pyauditor-macos (3.10) / build-pyauditor	6m 14s
build-pyauditor-macos (3.11) / build-pyauditor	8m 54s
build-pyauditor-macos (3.12) / build-pyauditor	7m 22s
build-pyauditor-macos (3.9) / build-pyauditor	7m 3s
build-pyauditor-windows (3.10) / build-pyauditor	9m 32s
build-pyauditor-windows (3.11) / build-pyauditor	9m 37s
build-pyauditor-windows (3.12) / build-pyauditor	8m 47s
build-pyauditor-windows (3.9) / build-pyauditor	13m 45s
test-pyauditor-source / test-pyauditor	4m 15s
pyauditor-docs / build_and_push	28s
pyauditor-integration-tests / pyauditor-integration-test	4m 9s
python-code-tests (3.10) / mypy-apel-plugin	23s
python-code-tests (3.10) / unit-tests-apel-plugin	27s
python-code-tests (3.11) / mypy-apel-plugin	19s
python-code-tests (3.11) / unit-tests-apel-plugin	26s
python-code-tests (3.12) / mypy-apel-plugin	21s
python-code-tests (3.12) / unit-tests-apel-plugin	24s
python-code-tests (3.9) / mypy-apel-plugin	19s
python-code-tests (3.9) / unit-tests-apel-plugin	22s
pyauditor-docs / update_latest	0s
release-pyauditor	0s
release-python-packages	0s
	1h 50m 53s

Provide feedback