diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-05-30 08:42:20 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-05-30 08:42:20 +0200 |
| commit | 1ad3f9651b0cdc75b7efd819b112ffa1efa16538 (patch) | |
| tree | 6d92726929de51201326cdd51cb6114d8046ed4d | |
| parent | f664af2d8e9451cd03bf1d815139514bff8956d1 (diff) | |
| download | coderay-1ad3f9651b0cdc75b7efd819b112ffa1efa16538.tar.gz | |
Removed merge issue
* .travis.yml:
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2c7b0f4..ea1f1c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ rvm: - jruby-19mode - jruby-head - rbx-2 ->>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615 branches: only: - master |