From 43258873454631212455756a6f34350b836805ad Mon Sep 17 00:00:00 2001
From: Brian Henry <BrianHenryIE@gmail.com>
Date: Sat, 30 Jan 2021 12:58:28 -0800
Subject: [PATCH] Bad merge conflict fix fixed

---
 src/Composer/Autoload/NamespaceAutoloader.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Composer/Autoload/NamespaceAutoloader.php b/src/Composer/Autoload/NamespaceAutoloader.php
index e5999247..669b02c8 100644
--- a/src/Composer/Autoload/NamespaceAutoloader.php
+++ b/src/Composer/Autoload/NamespaceAutoloader.php
@@ -22,7 +22,6 @@ abstract class NamespaceAutoloader implements Autoloader
      * A package's composer.json config autoload key's value, where $key is `psr-0`|`psr-4`|`classmap`.
      *
      * @param stdClass[] $autoloadConfig
-     * @param $autoloadConfig
      *
      * @return void
      */