diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-02-09 16:14:20 +0000 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-02-09 16:14:20 +0000 |
| commit | 5123c4509ecd829899fc070d1a95bf2d04b749e8 (patch) | |
| tree | a18f42c70a61964bca869470bd44da2c7c7decb3 | |
| parent | 0432cb883fc93bd75481ee5aa8a5fccbe9f3f132 (diff) | |
| parent | 7fa3d36e8a1d245e55a1d6100e61ca88b43feb5b (diff) | |
Merge branch 'master' into migrate_from_osgb36_to_wgs84
| -rw-r--r-- | conf/general-example | 6 | ||||
| -rw-r--r-- | conf/packages | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/conf/general-example b/conf/general-example index 87973d9e0..20872ae28 100644 --- a/conf/general-example +++ b/conf/general-example @@ -25,12 +25,6 @@ define('OPTION_BCI_DB_NAME', 'bci'); define('OPTION_BCI_DB_USER', 'bci'); define('OPTION_BCI_DB_PASS', ''); -define('OPTION_DRESS_DB_HOST', 'localhost'); -define('OPTION_DRESS_DB_PORT', '5432'); -define('OPTION_DRESS_DB_NAME', 'dress'); -define('OPTION_DRESS_DB_USER', 'dress'); -define('OPTION_DRESS_DB_PASS', ''); - define('OPTION_BASE_URL', 'http://www.example.org'); # Which country are you operating in? ISO3166-alpha2 code please diff --git a/conf/packages b/conf/packages index bbdb4aa29..a37518611 100644 --- a/conf/packages +++ b/conf/packages @@ -26,4 +26,5 @@ libjson-perl libimage-size-perl libmath-bigint-gmp-perl libtext-template-perl -gettext
\ No newline at end of file +gettext +libtest-exception-perl |