From f6d06ef3909763a33713a82501dc05062ab2a285 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 10 Jul 2014 08:46:16 +0300
Subject: [PATCH] HostPreference conflict #769

---
 yesod/Yesod/Default/Config.hs | 2 +-
 yesod/yesod.cabal             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yesod/Yesod/Default/Config.hs b/yesod/Yesod/Default/Config.hs
index b256cc2a..dba3889d 100644
--- a/yesod/Yesod/Default/Config.hs
+++ b/yesod/Yesod/Default/Config.hs
@@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe)
 import qualified Data.HashMap.Strict as M
 import System.Environment (getArgs, getProgName, getEnvironment)
 import System.Exit (exitFailure)
-import Data.Conduit.Network (HostPreference)
+import Data.Streaming.Network (HostPreference)
 import Data.String (fromString)
 
 -- | A yesod-provided @'AppEnv'@, allows for Development, Testing, and
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index d2282c2e..54a5bf7d 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.2.6
+version:         1.2.6.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -50,6 +50,7 @@ library
                    , fast-logger
                    , conduit-extra
                    , shakespeare
+                   , streaming-commons
 
     exposed-modules: Yesod
                    , Yesod.Default.Config