Merge branch '2.7' into 2.8

* 2.7:
  fixed bad merge
This commit is contained in:
Fabien Potencier 2016-05-09 14:39:10 -05:00
commit d86918e1c0

View File

@ -100,8 +100,6 @@ class WebProfilerExtensionTest extends TestCase
$this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
}
$this->assertSame($enabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
$this->assertSaneContainer($this->getDumpedContainer());
}