Merge remote-tracking branch 'pulzarraider/patch-5' into 2.0

fabpot · fabpot · commit 94940fe31055 · 2011-09-28T10:03:46.000+02:00
* pulzarraider/patch-5: Fix for {@inheritdoc} phpDoc tag.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, $resource, array $opt
     }
 
     /**
-     * @{inheritdoc}
+     * {@inheritdoc}
      */
     public function getRouteCollection()
     {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, $resource, array $opt`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * @{inheritdoc}`
	`47`	`+ * {@inheritdoc}`
`48`	`48`	`*/`
`49`	`49`	`public function getRouteCollection()`
`50`	`50`	`{`