jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Michael van der Werve 2020-10-15 10:27:01 +02:00
parent 6b9fc48923 73d74fe37e
commit a7f2991b35
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -91,7 +91,7 @@ before_install:
- uname -a - uname -a
# Use an artful container - gives us access to latest compilers. # 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 - docker ps