fix merge

Tobion · Tobion · commit 3146062fb7bd · 2015-09-29T14:13:09.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -237,8 +237,6 @@ public function setClass($class)
      * Gets the service class.
      *
      * @return string|null The service class
-     *
-     * @return string The service class
      */
     public function getClass()
     {

Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,6 @@ public function setClass($class)`
`237`	`237`	`* Gets the service class.`
`238`	`238`	`*`
`239`	`239`	`* @return string\|null The service class`
`240`		`- *`
`241`		`- * @return string The service class`
`242`	`240`	`*/`
`243`	`241`	`public function getClass()`
`244`	`242`	`{`