summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Pugh2016-08-16 19:48:24 (GMT)
committerGitHub2016-08-16 19:48:24 (GMT)
commit1c37e9bf17391cb26b9d2b803138ada64e1c3e9d (patch)
treed83308b4c2d0dd7a585263b2c4a20ec83b4dd01d
parentb1b875a69faa6728a878be5f8d042272a4cd959a (diff)
-rw-r--r--.travis.yml9
1 files changed, 1 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 7f59482..c237763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,8 @@ branches:
env:
global:
-<<<<<<< HEAD
- AEGIR_HOSTING_VERSION=7.x-3.x
- AEGIR_TESTS_VERSION=master
-=======
- - DOCKER_VERSION=1.12.0-0~trusty
- - DOCKER_COMPOSE_VERSION=1.7.1
- - AEGIR_TESTS_VERSION
- - AEGIR_HOSTMASTER_VERSION=7.x-3.x
->>>>>>> 113d160f9107250614c08bdd42a180275a268ab2
#env:
# - test: Ubuntu 14.04 Apache
@@ -52,4 +45,4 @@ before_install:
script:
# Tests are included in the docker-compose.yml file in the tests repo.
- - sudo docker-compose -f docker-compose-provision.yml run hostmaster --rm \ No newline at end of file
+ - sudo docker-compose -f docker-compose-provision.yml run hostmaster --rm