Merge branch 'master' of github.com:yiisoft/yii2

4886a3b3 · Klimov Paul · 7ddca600 · 36fe23da · 4886a3b3
Commit 4886a3b3 authored Jun 16, 2014 by Klimov Paul
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

AssetControllerTest.php ...nit/framework/console/controllers/AssetControllerTest.php +1 -1

No files found.
--- a/tests/unit/framework/console/controllers/AssetControllerTest.php
+++ b/tests/unit/framework/console/controllers/AssetControllerTest.php
@@ -278,7 +278,7 @@ EOL;
        ];
        $bundleFile = $this->testFilePath . DIRECTORY_SEPARATOR . 'bundle.php';

-        $configFile = $this->testFilePath . DIRECTORY_SEPARATOR . 'config.php';
+        $configFile = $this->testFilePath . DIRECTORY_SEPARATOR . 'config2.php';
        $this->createCompressConfigFile($configFile, $bundles);

        // When :