fix merge

Author: nicolas-grekas

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 @@ public function __construct()
         );
     }
 
-    public function reset()
-    {
-        $this->privates = array();
-        parent::reset();
-    }
-
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped container that was already compiled.');