# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1274484902 -7200
# Node ID 188e3db6977aff45062ebc5e1f398b676a4a6396
# Parent  556473ba03996647705e41833d2c54c623ce0699
merged config files

diff -r 556473ba0399 -r 188e3db6977a development.ini
--- a/development.ini	Sat May 22 01:32:30 2010 +0200
+++ b/development.ini	Sat May 22 01:35:02 2010 +0200
@@ -39,7 +39,7 @@
 lang=en
 cache_dir = %(here)s/data
 ##a name for our application
-repo_name = Python-works
+hg_app_name = Python-works
 
 ####################################
 ###         BEAKER CACHE        ####
diff -r 556473ba0399 -r 188e3db6977a production.ini
--- a/production.ini	Sat May 22 01:32:30 2010 +0200
+++ b/production.ini	Sat May 22 01:35:02 2010 +0200
@@ -38,7 +38,8 @@
 static_files = true
 lang=en
 cache_dir = %(here)s/data
-repos_name = Python-works
+##a name for our application
+hg_app_name = Python-works
 
 ####################################
 ###         BEAKER CACHE        ####
@@ -69,7 +70,7 @@
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 sqlalchemy.db1.url = sqlite:///%(here)s/hg_app.db
-#sqlalchemy.db1.echo = True
+#sqlalchemy.db1.echo = False
 #sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true