[commit: ghc] wip/nfs-locking: Reorder os and env (9ff8773)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/9ff8773943c628ec660bd59de0e48e1eb9dd2e22/ghc

>---------------------------------------------------------------

commit 9ff8773943c628ec660bd59de0e48e1eb9dd2e22
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 12:55:34 2016 +0800

    Reorder os and env


>---------------------------------------------------------------

9ff8773943c628ec660bd59de0e48e1eb9dd2e22
 .travis.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64e8597..72e2f80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 sudo: false
 
-os:
-    - linux
-    - osx
-
-env:
-    matrix:
-        linux:
-            - CABALVER=1.22 GHCVER=7.10.3
+matrix:
+    include:
+        - os: linux
+          env: CABALVER=1.22 GHCVER=7.10.3
+        - os: osx
 
 addons:
     apt: