Fix a merge-conflict residue (#1021)

* Fix a merge-conflict residue

Due to the merge-conflict marker the code could not be executed and failed CI

* Update src/Downloader.php

Co-authored-by: Christian Flothmann <christian.flothmann@gmail.com>

---------

Co-authored-by: Christian Flothmann <christian.flothmann@gmail.com>

Author: heiglandreas

src/Downloader.php

@@ -51,11 +51,7 @@ class Downloader
     private $enabled = true;
     private $composer;
 
-<<<<<<< HEAD
-    public function __construct(Composer $composer, IoInterface $io, HttpDownloader $rfs)
-=======
-    public function __construct(Composer $composer, IOInterface $io, $rfs)
->>>>>>> 1.x
+    public function __construct(Composer $composer, IOInterface $io, HttpDownloader $rfs)
     {
         if (getenv('SYMFONY_CAFILE')) {
             $this->caFile = getenv('SYMFONY_CAFILE');