fix merge

nicolas-grekas · nicolas-grekas · commit 7dc71d9a6251 · 2018-12-01T10:47:14.000+01:00
diff --git a/Tests/Fixtures/php/services_default_env.php b/Tests/Fixtures/php/services_default_env.php
@@ -95,7 +95,7 @@ public function getParameterBag()
     /**
      * Computes a dynamic parameter.
      *
-     * @param string The name of the dynamic parameter to load
+     * @param string $name The name of the dynamic parameter to load
      *
      * @return mixed The value of the dynamic parameter
      *

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getParameterBag()`
`95`	`95`	`/**`
`96`	`96`	`* Computes a dynamic parameter.`
`97`	`97`	`*`
`98`		`- * @param string The name of the dynamic parameter to load`
	`98`	`+ * @param string $name The name of the dynamic parameter to load`
`99`	`99`	`*`
`100`	`100`	`* @return mixed The value of the dynamic parameter`
`101`	`101`	`*`