Fix merge error

This commit is contained in:
Ingo Schommer 2017-06-23 09:27:46 +12:00
parent e592bed3e5
commit fb09e0b65f

View File

@ -25,18 +25,6 @@ class GridFieldAddNewButtonTest extends SapphireTest
Category::class, Category::class,
]; ];
public function setUp()
{
parent::setUp();
Injector::nest();
}
public function tearDown()
{
parent::tearDown();
Injector::unnest();
}
public function testButtonPassesParentContextToSingletonWhenRelationListIsUsed() public function testButtonPassesParentContextToSingletonWhenRelationListIsUsed()
{ {
$group = $this->objFromFixture(PeopleGroup::class, 'group'); $group = $this->objFromFixture(PeopleGroup::class, 'group');