Merge branch 'master' of git@github.com:alsonkemp/turbinado

diegoeche · Nov 26, 2008 · 0ff3188 · 0ff3188
2 parents a5a308d + 9cddb0c
commit 0ff3188
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Config/App.hs b/Config/App.hs
@@ -28,7 +28,7 @@ newAppEnvironment = AppEnvironment
 -- Database connection
 ----------------------------------------------------------------
 databaseConnection :: Maybe (IO Connection)
-databaseConnection = Just $ connectPostgreSQL "host=localhost dbname=turbinado user=turbinado password=turbinado"
+databaseConnection = Nothing
 
 
 ----------------------------------------------------------------

diff --git a/turbinado.cabal b/turbinado.cabal
@@ -10,7 +10,7 @@ Build-Type:          Simple
 
 Executable server
   Main-is:             Turbinado/Server.hs
-  Build-Depends:       base, bytestring, containers, directory, filepath, harp, HDBC, HDBC-postgresql, hslogger, hsx, HTTP, mtl, network, old-locale, old-time, pandoc, parsec, plugins, pretty, regex-compat, time
+  Build-Depends:       base, bytestring, containers, directory, filepath, harp, HDBC, HDBC-postgresql, hslogger, hsx, HTTP, mtl, network, old-locale, old-time, parsec, plugins, pretty, regex-compat, time
   ghc-options: -F -pgmFtrhsx -O
   Extensions: MultiParamTypeClasses,
             FunctionalDependencies,