Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 0ff3188cd1e041d4abe5e5bdb6c5ce59265243fe 2 parents a5a308d + 9cddb0c
@alsonkemp authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  Config/App.hs
  2. +1 −1  turbinado.cabal
View
2  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
----------------------------------------------------------------
View
2  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,
Please sign in to comment.
Something went wrong with that request. Please try again.