Merge branch 'postgres' into simple

Conflicts: Application.hs config/settings.yml
yesodweb · Apr 29, 2015 · 88ae31b · 88ae31b
2 parents 4b48a68 + 0186fac
commit 88ae31b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/config/test-settings.yml b/config/test-settings.yml
@@ -1,2 +1 @@
-database:
-  database: PROJECTNAME_test
+{}