Fix bad merge conflict resolution

andrewbranch · andrewbranch · commit ba708b1b18d1 · 2022-12-05T15:41:47.000-08:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -1755,8 +1755,6 @@ function loadModuleFromFile(extensions: Extensions, candidate: string, onlyRecor
             return resolvedByAddingExtension;
         }
     }
-
-    return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
 }
 
 function loadModuleFromFileNoImplicitExtensions(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PathAndExtension | undefined {

Original file line number	Diff line number	Diff line change
`@@ -1755,8 +1755,6 @@ function loadModuleFromFile(extensions: Extensions, candidate: string, onlyRecor`
`1755`	`1755`	`return resolvedByAddingExtension;`
`1756`	`1756`	`}`
`1757`	`1757`	`}`
`1758`		`-`
`1759`		`- return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);`
`1760`	`1758`	`}`
`1761`	`1759`
`1762`	`1760`	`function loadModuleFromFileNoImplicitExtensions(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PathAndExtension \| undefined {`