From 358bdcaffeba5d22f9c3d0206f9560042bf4c5d5 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sun, 15 Mar 2020 14:24:16 +0100
Subject: [PATCH] Resolve unresolved merge conflict

---
 .../Component/DependencyInjection/ContainerBuilder.php       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 68a751a20cfdd..c210e03cefd27 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -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]);