DynFlags: Fix more merge errors
authorBen Gamari <ben@smart-cactus.org>
Tue, 27 Oct 2015 14:59:00 +0000 (15:59 +0100)
committerBen Gamari <ben@smart-cactus.org>
Tue, 27 Oct 2015 14:59:00 +0000 (15:59 +0100)
commitdc13467347fa9bf9e1a70389a2eccd9bd4853d21
treea3caa9382044ebd20bcc8c4cb0b51095fb40fa6b
parent079dd12cdd77271a070875780689a3dbd0913a87
DynFlags: Fix more merge errors
compiler/main/DynFlags.hs