diff options
| author | randym <[email protected]> | 2018-01-11 17:11:09 +0900 |
|---|---|---|
| committer | randym <[email protected]> | 2018-01-11 17:11:09 +0900 |
| commit | 8527d9242527bc76271c72b146b59a62592f1e06 (patch) | |
| tree | e3ebd8df82ac5a08e1f237d84cac88e4de29ecfe | |
| parent | f6a2d20d20fc116d00f1958e945ee8b28d16af6e (diff) | |
| parent | e897bc3748ba7fee60b6f6ad19415ed96b1ea7f7 (diff) | |
| download | caxlsx-8527d9242527bc76271c72b146b59a62592f1e06.tar.gz caxlsx-8527d9242527bc76271c72b146b59a62592f1e06.zip | |
fix(merge): resolve merge conflicts in .travis.yml
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 75643824..bc3caf35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,11 @@ notifications: matrix: include: - - rvm: 2.2.7 - - rvm: 2.3.4 - - rvm: 2.4.1 + - rvm: 2.1 + - rvm: 2.2.8 + - rvm: 2.3.5 + - rvm: 2.0.0 + - rvm: 2.4.2 - rvm: rbx-3 - rvm: jruby-19mode env: JRUBY_OPTS="-Xcli.debug=true --debug" |