Fix merge

This commit is contained in:
Nicolas Grekas 2015-03-27 19:02:17 +01:00
parent aea7b93a94
commit e5611d25dd

View File

@ -9,7 +9,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
/** /**
* ProjectServiceContainer * ProjectServiceContainer.
* *
* This class has been auto-generated * This class has been auto-generated
* by the Symfony Dependency Injection Component. * by the Symfony Dependency Injection Component.