on master help sign in
fix Timeout naming conflict

resolves #274

commit4fcb5101687d5a3bf34dcbf0fa9a85972446e702 authorAgentM <agentm@themactionfaction.com> dateThu 14 Jan 2021, 00:38 (6 years ago) parente125b9a
1 file changed+2−2
src/lib/ProjectM36/Server/EntryPoints.hs+2−2
src/lib/ProjectM36/Server/EntryPoints.hs+2−2
@@ -5,8 +5,8 @@ import ProjectM36.IsomorphicSchema
55import ProjectM36.Client as C
66import Data.Map
77import Control.Concurrent (threadDelay)
8−import Network.RPC.Curryer.Server
9−import System.Timeout
8+import Network.RPC.Curryer.Server
9+import System.Timeout hiding (Timeout)
1010import Network.Socket
1111import Control.Exception
1212