[commit: ghc] wip/nfs-locking: Fix merge conflicts (1ade885)

[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/1ade88547a2c3256c6b6e6de8c546a04dc1ae1d3/ghc

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

commit 1ade88547a2c3256c6b6e6de8c546a04dc1ae1d3
Merge: 9b70568 0c67f7d
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Aug 16 03:47:39 2017 +0100

    Fix merge conflicts



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

1ade88547a2c3256c6b6e6de8c546a04dc1ae1d3
 src/Rules.hs         | 9 +++++----
 src/Rules/Program.hs | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)