Fixed merge conflicts

Browse Source

...

This commit is contained in:

frikky

2023-07-06 17:39:40 +02:00

parent 6e405e781c 77a59537bd

commit 38fe58f1b6

209 changed files with 1826 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

.github/workflows/codeql-analysis.yml

Regular → Executable

.github/workflows/docker-build.yaml

Regular → Executable

.github/workflows/snyk-container-analysis.yml

Regular → Executable

.github/workflows/snyk-infrastructure-analysis.yml

Regular → Executable