diff options
| author | tduehr <tduehr@gmail.com> | 2014-01-22 15:29:14 -0600 |
|---|---|---|
| committer | tduehr <tduehr@gmail.com> | 2014-06-05 21:38:27 -0500 |
| commit | 1c54fdb13cea05ac4372f37c0668f6461af4bdd8 (patch) | |
| tree | 375b3747eb4e1706a3eb35ed7936957b0fc33137 | |
| parent | 37bf2b0bd6ae376f04de26c08869e037ec69ad0b (diff) | |
| download | ffi-1c54fdb13cea05ac4372f37c0668f6461af4bdd8.tar.gz | |
add rbx dependencies
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index b310b7a..2954ed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,18 @@ rvm: - "2.1" - "ruby-head" - "rbx-2.1.1" +<<<<<<< HEAD - "rbx" matrix: allow_failures: - rvm: "rbx-2.1.1" - rvm: "rbx" +======= + - "rbx-head" +matrix: + allow_failures: + - rvm: "rbx-2.1.1" + - rvm: "rbx-head" +>>>>>>> add rbx dependencies - rvm: "1.8.7" - rvm: "1.9.3" |