fix merge conflict

This commit is contained in:
Michael van der Werve 2020-10-15 10:27:01 +02:00
commit a7f2991b35
1 changed files with 1 additions and 1 deletions

View File

@ -91,7 +91,7 @@ before_install:
- uname -a
# Use an artful container - gives us access to latest compilers.
- docker run -e "DEBIAN_FRONTEND=noninteractive" -d --name ubuntu-test-container -v $(pwd):/travis ubuntu:bionic tail -f /dev/null
- docker run -e "DEBIAN_FRONTEND=noninteractive" -d --name ubuntu-test-container -v $(pwd):/travis ubuntu:focal tail -f /dev/null
- docker ps