From: Luke Lau <luke_lau@icloud.com>
Date: Thu, 6 Dec 2018 22:09:57 +0000 (+0000)
Subject: Merge branch 'master' into travis-windows
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=d9e5c22f6c996a74ac8a4daca0e64003798a723d

Merge branch 'master' into travis-windows
---

d9e5c22f6c996a74ac8a4daca0e64003798a723d
diff --cc .travis.yml
index 8b89afd,07dc18b..4d0f052
--- a/.travis.yml
+++ b/.travis.yml
@@@ -37,7 -23,7 +37,7 @@@ before_install
    - git init
    - git remote add origin https://github.com/haskell/haskell-ide-engine.git
    - git pull origin master
-   - git checkout ed512e250b8699d212417191064e5fbbc0ecdac8
 -  - git checkout 890ca3f2f3bd3bfe74e1f38a426b383a847763bb
++  - git checkout 1a5640f4790bde364dcd0a61617c5ca5b85b145a
    - git submodule init
    - git submodule sync
    - git submodule update --init