Skip to content

Commit

Permalink
Fix a merge-conflict residue (#1021)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
heiglandreas and xabbuh authored Apr 17, 2024
1 parent 96f355d commit 1691a42
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/Downloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 1691a42

Please sign in to comment.