Bad merge conflict fix fixed

BrianHenryIE · Jan 30, 2021 · 4325887 · 4325887
1 parent 72b604d
commit 4325887
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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
      */