fixed bad merge
This commit is contained in:
parent
4d8a71d321
commit
f2419ddda6
@ -142,7 +142,6 @@ class ConfigurationTest extends TestCase
|
||||
));
|
||||
}
|
||||
|
||||
>>>>>>> 3.4
|
||||
public function testAssetsCanBeEnabled()
|
||||
{
|
||||
$processor = new Processor();
|
||||
|
Reference in New Issue
Block a user