diff options
| author | Andre Arko <andre@arko.net> | 2015-05-07 20:34:51 +0100 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2015-05-07 20:34:51 +0100 |
| commit | f5c2963f0e843cb2d35ca95f41c5cebaf7062aa5 (patch) | |
| tree | 9b6072ca8996dd96635b3ac5810bdb93429ab45a | |
| parent | 95858d54e19a6fe1adffeefc9e7eba942d3c8332 (diff) | |
| download | bundler-f5c2963f0e843cb2d35ca95f41c5cebaf7062aa5.tar.gz | |
merge conflict :grimacing:
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 95c2f51d61..5cc3abdd0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,20 +5,7 @@ before_script: travis_retry rake spec:travis:deps branches: only: - master -<<<<<<< HEAD - 2-0-dev -======= - - 1-99-dev - - 1-9-stable ->>>>>>> 1-99-dev - - 1-8-stable - - 1-7-stable - - 1-6-stable - - 1-5-stable - - 1-3-stable - - 1-2-stable - - 1-1-stable - - 1-0-stable notifications: email: |