Skip to content

Commit

Permalink
Merge branch '2.3' into 2.4
Browse files Browse the repository at this point in the history
* 2.3:
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
  • Loading branch information
fabpot committed Jan 1, 2014
2 parents 2b311f5 + 2a10c64 commit de4e17d
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions TemplateNameParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

namespace Symfony\Component\Templating;

use Symfony\Component\Templating\TemplateReferenceInterface;
use Symfony\Component\Templating\TemplateReference;

/**
* TemplateNameParser is the default implementation of TemplateNameParserInterface.
*
Expand Down

0 comments on commit de4e17d

Please sign in to comment.