[commit: ghc] wip/nfs-locking: Merge pull request #270 from ggreif/patch-1 (03ffd8e)

[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/03ffd8e37ba2b55bbba5b97b5a8aa4dfed2afa84/ghc

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

commit 03ffd8e37ba2b55bbba5b97b5a8aa4dfed2afa84
Merge: 0053526 e1b6e52
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jul 16 18:22:33 2016 +0100

    Merge pull request #270 from ggreif/patch-1
    
    Typo [skip ci]



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

03ffd8e37ba2b55bbba5b97b5a8aa4dfed2afa84
 doc/user-settings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)