diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be918f8..c9da4b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,7 @@ jobs: git checkout release - git merge --strategy-option theirs master-ci + git merge --strategy-option theirs origin/master-ci sed -i -e 's/DEBUG = True/DEBUG = False/g' brickbox/settings.py