Skip to content

GitLab

provide bootstrap script

4 jobs for 419-external-settings-with-python-dist in 2 minutes and 4 seconds (queued for 5 seconds)
latest
6cbc2890
1 related merge request: !68 419 external settings with python dist
Name Stage Failure
failed
test-merge Test 
Auto-merging castellum_core/castellum_core/main/wsgi.py
CONFLICT (content): Merge conflict in castellum_core/castellum_core/main/wsgi.py
Auto-merging castellum_core/castellum_core/main/urls.py
CONFLICT (content): Merge conflict in castellum_core/castellum_core/main/urls.py
Auto-merging castellum_core/castellum_core/main/settings/default.py
CONFLICT (content): Merge conflict in castellum_core/castellum_core/main/settings/default.py
Auto-merging castellum_core/castellum_core/locale/de/LC_MESSAGES/djangojs.po
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Job failed: exit code 1