[commit: ghc] wip/nfs-locking: Merge pull request #230 from cocreature/stack-shake-0.15.6 (6826d14)

[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/6826d14069396002e5a1fbee6b8c9c1a54cda815/ghc

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

commit 6826d14069396002e5a1fbee6b8c9c1a54cda815
Merge: cf5ab9a 028ef28
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Apr 22 19:44:30 2016 +0100

    Merge pull request #230 from cocreature/stack-shake-0.15.6
    
    Add shake-0.15.6 to stack extra-deps



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

6826d14069396002e5a1fbee6b8c9c1a54cda815
 stack.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)