[commit: ghc] master: DynFlags: Fix more merge errors (dc13467)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dc13467347fa9bf9e1a70389a2eccd9bd4853d21/ghc

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

commit dc13467347fa9bf9e1a70389a2eccd9bd4853d21
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Oct 27 15:59:00 2015 +0100

    DynFlags: Fix more merge errors


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

dc13467347fa9bf9e1a70389a2eccd9bd4853d21
 compiler/main/DynFlags.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index f22011e..97b15d3 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1565,7 +1565,9 @@ defaultDynFlags mySettings =
 
         maxInlineAllocSize = 128,
         maxInlineMemcpyInsns = 32,
-        maxInlineMemsetInsns = 32
+        maxInlineMemsetInsns = 32,
+
+        reverseErrors = False
       }
 
 defaultWays :: Settings -> [Way]