[commit: ghc] wip/nfs-locking: Fix Merge. (e519681)

[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/e5196817511ddd50939d1f11b8ff2d6d856aa203/ghc

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

commit e5196817511ddd50939d1f11b8ff2d6d856aa203
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Jan 12 15:41:55 2016 +0800

    Fix Merge.


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

e5196817511ddd50939d1f11b8ff2d6d856aa203
 src/Main.hs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Main.hs b/src/Main.hs
index 6d79cb8..b372fa1 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -11,11 +11,8 @@ import qualified Rules.Gmp
 import qualified Rules.Libffi
 import qualified Rules.Oracles
 import qualified Rules.Perl
-<<<<<<< HEAD
-import Oracles.Config.CmdLineFlag (cmdLineOracle, flags)
-=======
 import qualified Test
->>>>>>> master
+import Oracles.Config.CmdLineFlag (cmdLineOracle, flags)
 
 main :: IO ()
 main = shakeArgsWith options flags $ \cmdLineFlags targets ->