Merge remote-tracking branch 'origin/master' into port-resource-effect-for-1.0

fused-effects-exceptions.cabal

@@ -3,8 +3,8 @@ cabal-version:       2.4
 name:                fused-effects-exceptions
 version:             1.0.0.0
 synopsis:            Handle exceptions thrown in IO with fused-effects.
-description:         Provides Resource and Catch effects capable of reacting to and catching GHC's dynamic exceptions
-homepage:            https://github.com/patrickt/fused-effects-exceptions#readme
+description:         Provides Resource and Catch effects capable of reacting to and catching GHC's dynamic exceptions.
+homepage:            https://github.com/fused-effects/fused-effects-exceptions#readme
 license:             BSD-3-Clause
 license-file:        LICENSE
 author:              Josh Vera, Patrick Thomson, and Rob Rix

src/Control/Effect/Catch.hs

@@ -13,6 +13,11 @@ module Control.Effect.Catch
   ( Catch (..)
   , catch
   , catchSync
+<<<<<<< HEAD
+=======
+  , runCatch
+  , CatchC (..)
+>>>>>>> origin/master
   ) where
 
 import           Control.Carrier