symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-5Lines changed: 0 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-5Lines changed: 0 additions & 5 deletions
@@ -994,13 +994,8 @@ public function setDefinition($id, Definition $definition)
 
         $id = (string) $id;
 
-<<<<<<< HEAD
         if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
-            throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
-=======
-        if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) {
             throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id));
->>>>>>> 3.4
         }
 
         unset($this->aliasDefinitions[$id], $this->removedIds[$id]);