diff options
| author | Patrick Seeger <pseeger@ccwn.org> | 2012-06-22 10:59:33 +0200 |
|---|---|---|
| committer | Patrick Seeger <pseeger@ccwn.org> | 2012-06-22 10:59:33 +0200 |
| commit | 3e38cb6a4881caf36df699cf36b82d1fad31326b (patch) | |
| tree | 6a797714672c4ab07fe7fbb14ab2a5abe891a164 /protected/config/test.php | |
| parent | 4f959ffc80e64dc9ee8383826a546723d97305d9 (diff) | |
| parent | e4d6e829d133584fd04e5f7ae36ba786115b7586 (diff) | |
Merge branch 'master' of ssh://proxy.ccwn.org:9044/home/ccwn/git-repos/admin.astaf.de
Diffstat (limited to 'protected/config/test.php')
| -rw-r--r-- | protected/config/test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protected/config/test.php b/protected/config/test.php index fd7085a..bdb4ad9 100644 --- a/protected/config/test.php +++ b/protected/config/test.php @@ -1,7 +1,7 @@ <?php return CMap::mergeArray( - require(dirname(__FILE__).'/main.php'), + require(dirname(__FILE__).'/maincfg.php'), array( 'components'=>array( 'fixture'=>array( |