From fb09e0b65fe983397fa57046816e3d210f4930d9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Fri, 23 Jun 2017 09:27:46 +1200
Subject: [PATCH] Fix merge error

---
 .../Forms/GridField/GridFieldAddNewButtonTest.php    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/php/Forms/GridField/GridFieldAddNewButtonTest.php b/tests/php/Forms/GridField/GridFieldAddNewButtonTest.php
index e538f812d..c0dd6a40c 100644
--- a/tests/php/Forms/GridField/GridFieldAddNewButtonTest.php
+++ b/tests/php/Forms/GridField/GridFieldAddNewButtonTest.php
@@ -25,18 +25,6 @@ class GridFieldAddNewButtonTest extends SapphireTest
         Category::class,
     ];
 
-    public function setUp()
-    {
-        parent::setUp();
-        Injector::nest();
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-        Injector::unnest();
-    }
-
     public function testButtonPassesParentContextToSingletonWhenRelationListIsUsed()
     {
         $group = $this->objFromFixture(PeopleGroup::class, 'group');