Merge branch '4.1'
* 4.1: fixed bad merge
This commit is contained in:
commit
00f25ee8f7
@ -144,7 +144,6 @@ class ConfigurationTest extends TestCase
|
||||
));
|
||||
}
|
||||
|
||||
>>>>>>> 3.4
|
||||
public function testAssetsCanBeEnabled()
|
||||
{
|
||||
$processor = new Processor();
|
||||
|
Reference in New Issue
Block a user