From 3146062fb7bd5679e86f350aae0bf6fe2a627dee Mon Sep 17 00:00:00 2001
From: Tobias Schultze <webmaster@tubo-world.de>
Date: Tue, 29 Sep 2015 14:13:09 +0200
Subject: [PATCH] fix merge

---
 src/Symfony/Component/DependencyInjection/Definition.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 5e1b2a93ee..777f4a6054 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -237,8 +237,6 @@ class Definition
      * Gets the service class.
      *
      * @return string|null The service class
-     *
-     * @return string The service class
      */
     public function getClass()
     {