From ffa1c98ef3a3c9f3ef0198b3f908da4efc44eb78 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 24 Jun 2020 17:11:49 -0400 Subject: Drop merge conflict issue --- rts/rts.cabal.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index a890d3dc1d..b866a909d7 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -309,8 +309,6 @@ library "-Wl,-u,base_GHCziIOziException_cannotCompactFunction_closure" "-Wl,-u,base_GHCziIOziException_cannotCompactPinned_closure" "-Wl,-u,base_GHCziIOziException_cannotCompactMutable_closure" - "-Wl,-u,base_GHCziIOPort_doubleReadException_closure" - "-Wl,-u,base_ControlziExceptionziBase_absentSumFieldError_closure" "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure" "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure" "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure" -- cgit v1.2.1