From f34fcb66ea50da6613686e88f5f202ce0f1ade7b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 2 Oct 2018 15:06:13 +0200
Subject: [PATCH] fix merge

---
 .../Tests/Fixtures/php/services_tsantos.php           | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
index 30efad829d..3fa375382b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
@@ -19,11 +19,6 @@ class ProjectServiceContainer extends Container
     private $parameters;
     private $targetDirs = array();
 
-    /**
-     * @internal but protected for BC on cache:clear
-     */
-    protected $privates = array();
-
     public function __construct()
     {
         $this->services = $this->privates = array();
@@ -35,12 +30,6 @@ class ProjectServiceContainer extends Container
         );
     }
 
-    public function reset()
-    {
-        $this->privates = array();
-        parent::reset();
-    }
-
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');