Fix merge conflict from false merge request into main (!27) · Merge requests · Computational Metagenomics / CloWM / CloWM S3-Proxy Service · GitLab

Snippets Groups Projects

Looking for advice? Join the Matrix channel for GitLab users in Bielefeld!

This is an archived project. Repository and other project resources are read-only.

Merged Daniel Göbel requested to merge bugfix/fix-merge-conflict into development 2 years ago

Viewing commit 2b06d299

Show latest version

Verified

2b06d299

Merge branch 'main' into development · 2b06d299
Daniel Göbel authored 2 years ago
```
# Conflicts:
#	traefik_dev/routes.toml
```