summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-05-11 09:55:43 +0100
committerThom May <thom@may.lt>2015-05-11 09:55:43 +0100
commit4793b2818f3d5f38b8a9fcc8b479e10cfcfa2c02 (patch)
treea2cc1c4311a669065e2211e0cec861e33af9484d
parentcfd192d9240af5274e519f91f872944ea66ea927 (diff)
parent6ae97462d8ff84a5c32c623ff3a2054cbfbb9392 (diff)
downloadffi-yajl-4793b2818f3d5f38b8a9fcc8b479e10cfcfa2c02.tar.gz
Merge pull request #58 from AaronLasseigne/patch-1
fix parse error in travis.yml
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d86dd03..e659646 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,6 @@ matrix:
jdk: openjdk7
- rvm: jruby-head
jdk: openjdk6
- branches:
- only:
- - master
+branches:
+ only:
+ - master